Wizard controller coding imporvements