More work on macros