Wizard improved