updated view and controller