Changed class methods to instance methods