updated calendar handling