Changes at the end of class