add working macros