Thanks to Kshitij, calendar expands and contracts now as well