Removed Calendar
Added back the calendar