Cont'd Wizard development