are other ways to approach this, and I would be happy to revert it if we come up with a better solution.