changed classes to defines