refactored DrmCalendar
more refactoring