Modify tracker for regular use.
Corrections to tracker C.