Handled minor changes in tracking.