changed classes to objects