Silvia's edits
Forgot to update Tracker.java (Silvia's work)