updated calendar management