Changed all Date objects to GregorianCalendar objects