Did changes to macro definaion