working on view
merge