Improvements to tracking.