Refactoring dynamics, cannotHave, adding in suggestions