Troubleshoot tracking issues

Isolating the tracking functions from the cutting functions helps to diagnose tracking issues.