Improvements for retracking.