Less flickering on calendar upadates