Finish refactoring step-4 data changes