part of refactoring that didn't get committed