Proposed new macro