More work on versus view
Merge