diff --git a/basic_search_replace.yml b/basic_search_replace.yml
index 16919b2..c9c17bb 100644
--- a/basic_search_replace.yml
+++ b/basic_search_replace.yml
@@ -46,6 +46,9 @@ onInstall:
 
         #user: root
         #sayYes: true
+onUninstall: 
+    - cmd [cp]: |-
+        rm -r /var/www/webroot/mightybox-search-replace-db
 
 
 actions:
@@ -56,14 +59,24 @@ actions:
           - command: ${this.cmd}
 
     searchReplace:
-      - nodeGroup: cp
-        cmd: |-
-          cd /var/www/webroot/mightybox-search-replace-db/
-          ./basic_search_replace.sh ${settings.termSearch} ${settings.termReplace}
-        if ( ${settings.testMode} == true ):
-          cmd: |-
-            cd /var/www/webroot/mightybox-search-replace-db/
-            ./basic_search_replace-dry-run.sh ${settings.termSearch} ${settings.termReplace}
+
+      - if ( ${settings.testMode} == false ):
+          - cmd [cp]: |-
+              cd /var/www/webroot/mightybox-search-replace-db/
+              ./basic_search_replace.sh ${settings.termSearch} ${settings.termReplace} >> /var/www/webroot/mightybox-search-replace-db/searchreplace.log
+              wp cache flush --quiet --path=/var/www/webroot/ROOT/
+              rm -rf /var/www/webroot/.cache/vhosts/Jelastic/*
+              tail -8 /var/www/webroot/mightybox-search-replace-db/searchreplace.log | head -7
+      - if ( ${settings.testMode} == true ):
+          - cmd [cp]: |-
+              cd /var/www/webroot/mightybox-search-replace-db/
+              ./basic_search_replace-dry-run.sh ${settings.termSearch} ${settings.termReplace} >> /var/www/webroot/mightybox-search-replace-db/searchreplace.log
+              wp cache flush --quiet --path=/var/www/webroot/ROOT/
+              rm -rf /var/www/webroot/.cache/vhosts/Jelastic/*
+              tail -8 /var/www/webroot/mightybox-search-replace-db/searchreplace.log | head -7
+      - return:
+        type: success
+        message: ${response.out}
             
 
 buttons: