still more refactoring