merged changes done for wizard.