Refactor-checkpoint5
Integrate the last model change