refactoring; temporary change to mutating the plan