ok works
fixing macros