Syntax and logic changes to the initial calendar