refactored some of the Wizards