major update for wizard