refactoring underway