- updating wizard to use non-internal API only