Master calendar and final changes