lot of work on wizard