Moved the ownership check in the view back to the view