Added some changes to Time.java