MODIFY: {macros/} make them more universal