refactoring in progress, nothing works