more work on calendars