mid-refactor in model