3rd commit

add #define to replace constants