changed over to defines
going back to work on m1