refactoring
tracking down failing test