Changed using GregorianCalendar() with Calendar.getInstance()