Tracking functionality updated.