made changes to the macros, and also modified MakeFile