Changes to Tracker.java