Wizard implementation + bug fix