somewhat merged the calendar