Modifications in the class #7