various changes to add custom calendar