altered calendar-model, rel #405