Major changes in the class