changed wizard code