Macros starting to improve