Improved tracker.