IMPROVED TRACKING..