fixed missing new refactoring stuff