separate newCalendar and addCalendar

break addCalendar into a newCalendar and addCalendar method