Did changes to the macro implemention