turn this into a macro
2 files changed