pre-refactoring branch commit