Last changes at end of class