add: wizard improvement