in middle of refactoring