Modified some files during the class