Updates To Wizard Tool