optimise tracking
optimise tracking