Extended tracking (1/16)

Extended tracking