Modify model and view
Merge code