debugging changes macros added