Updates for the Calendar Pull Request