Still attempting to fix the calendar