Tracker Improvements