improved wizard
6 files changed