More wizard updates
no icheck