Changes to CalendarRenderer