pre-refactor commit