Tracker is starting to work like it should