Optimizations of tracking