changed to defines