Added corrrect views (to be edited)