changed the order of class methods