some refactoring didn't go quite so right