Updated Track.java and Queue.java