Modified the Calendar class