Improved Tracker Implementation