[new model] simplify and adjust the model
Merge branch 'pu' into new_model