Last minute changes from last class