altered model-calendar, FIX #15