refactoring, emptying for now