Improved tracking mode