Wizard update

Wizard setup and updating