Removed Warning/Added final view change parameter