patching tool is ee only, organizing