Patch from Dan Scott to: