Smart tracking (11/13)

Smart tracking