More work on the calendar