Tracking improved