Made the wizard work better than before