macro safety measures and new key related macros