Moved macros to rep file