Revert "Revert "calendar update""

This reverts commit d00719172f196d29d29d3954af92e92fbd1a1d85.