refactor to officer-mason