wizard refactored.