few changes in calendar issues