re-organized wizards