Added changes in viewS