updated view
fixed merge conflicts