ENH: update the macro re #13