Changes for JQAWizard