Further work on calendar reworking