Editted in the classes