Updated wait for calendar