more macros
really no change
Merge branch 'mod' into new_mod