in the middle of the refactoring