Rearranged code
Rearranged code
Rearranged code
Rearranged code
Updating calendar instead of re-building it