Macros working, no warnings