working on the tracker