Edited Wizard. Still broken...