more refactoring in progress