Extended tracking (9/16)

Extended tracking