[IMP] improved wizard