continued working on CustomCalendar