mid-refactor commit