Big change to calendar view functions. We now declare