Enhance Tracking System