Slight modification to tracking