refactoring, not finished