classes and methods fixed