Coverted a couple of views.