refactored wizard