changing how controllers are set up to something that may catch more edge cases