Reworking the wizard.