pre-refactoring commit