Small improvement with calendar