Modified for changing of views