Macros seem to be fine now