Getting rid of the MACROS