Changed to use just one view.