Add some optimisation to the calendar