Wizard improvement