some changes to the view
merge