Again some Wizard Changes