I would like to commit the modified wizard. Also Brad's cache changes are already in cvs. I would like to commit Brad's modification too on the wizard. Thanks.