added controlled view
merging