more updates to managing macros