moved macros to sep file