Slight modification of the tracker.