more work on the tracker