Jacalvo/improved wizards