changed all items which this wizard uses to be of class scope