Changes to calendar to ensure load is correct and quick.