minor changes in the macro