Removing else statement to make sure that current calendar is set as well if updated just in case that causes issues
Updated bitwise flags to be more robust if more flags are added in the future