Still trying to fix the calendar