Extended tracking (12/16)

Extended tracking