edited methods and classes