[3339, 3343] wizard improvement