diff --git a/README.md b/README.md
index 3c62200..3afd525 100644
--- a/README.md
+++ b/README.md
@@ -17,11 +17,19 @@ Because I'm a Linux fan and this is my first try with powershell
 this script is really simple and could not work properly, burn your cat
 and cut your Little Pony head.  
 
+#How?
+
+This script kill GWX executable, then remove some Scheduled Task about 
+GWX program, uninstall some KB with wusa.exe and hide it to prevent automatic 
+reinstallation.
+
 #TODO
 
- * Add privilege elevation error when the script is not launched with Administrator's rights
- * Add the possibility to use arguments when calling the script (then ps script could be call from
- another script)
+ * Add privilege elevation error when the script is not launched with 
+ Administrator's rights
+ * Add the possibility to use arguments when calling the script (then ps script 
+ could be call from  another script)
+ * Remove GWX Files before uninstalling KB (check remove_gwx_file branch)
  * ~~Update the windows update list to hide kb that aren't yet listed~~ 
  * ~~Speed up hide_update~~  
  * **Tell me**
diff --git a/remove-kb.ps1 b/remove-kb.ps1
index e29d586..d9f03de 100755
--- a/remove-kb.ps1
+++ b/remove-kb.ps1
@@ -1,4 +1,5 @@
-$kbIDs=("KB3075249", #telemetry for Win7/8.1
+$kbIDs=("KB2976978", #telemetry for Win8/8.1
+        "KB3075249", #telemetry for Win7/8.1
         "KB3080149", #telemetry for Win7/8.1
         "KB3021917", #telemetry for Win7
         "KB3022345", #telemetry
@@ -7,16 +8,18 @@ $kbIDs=("KB3075249", #telemetry for Win7/8.1
         "KB3035583", #Get Windows 10 for Win7sp1/8.1
         "KB2990214", #Get Windows 10 for Win7 without sp1
         "KB2952664", #Get Windows 10 assistant
-        "KB2976978",
-        "KB2876229",
+        "KB3075853", #Update on Win8.1/Server 2012R2
+        "KB3065987", #Update for Windows Update on Win7/Server 2008R2
+        "KB3050265", #Update for Windows Update on Win7
+        "KB3075851", #Update for Windows Update on Win7
+        "KB2902907",
         "KB2953664"
 )
-
 $sheduledTasks=(
-    "launchtrayprocess",
-    "refreshgwxconfig",
-    "refreshgwxconfigandcontent",
-    "regreshgwxcontent"
+    @{name = "launchtrayprocess"; directory = "\Microsoft\Windows\Setup\GWX"},
+    @{name = "refreshgwxconfig"; directory = "\Microsoft\Windows\Setup\GWX"},
+    @{name = "refreshgwxconfigandcontent"; directory = "\Microsoft\Windows\Setup\GWX"},
+    @{name = "refreshgwxcontent"; directory = "\Microsoft\Windows\Setup\GWX"}
 )
 
 # You need to modify this variable whith administrator group name
@@ -27,13 +30,32 @@ $yes="O"
 function remove_tasks () {
     param($taskList)
     Foreach ($task in $taskList){
-        Write-Host -ForegroundColor white -NoNewline "Remove Task " $task
-        if (Get-ScheduledTask -TaskName $task -ErrorAction SilentlyContinue) {
-            Write-Host -NoNewline -ForegroundColor DarkGreen " found! "
-            Write-Host -Nonewline -ForegroundColor white "removing ... "
-            Try {Unregister-ScheduledTask -TaskName $task -ErrorAction SilentlyContinue -Confirm:$false}
-            Catch {
-                Write-Host -Nonewline -ForegroundColor white " Error "
+        Write-Host -ForegroundColor white -NoNewline "Remove Task " $task.name
+        if ($PSVersionTable.PSVersion.Major -gt 2) {
+            if (Get-ScheduledTask -TaskName $task.name -ErrorAction SilentlyContinue) {
+                Write-Host -NoNewline -ForegroundColor DarkGreen " found! "
+                Write-Host -Nonewline -ForegroundColor white "removing ... "
+                Try {Unregister-ScheduledTask -TaskName $task.name -ErrorAction SilentlyContinue -Confirm:$false}
+                Catch {
+                    Write-Host -Nonewline -ForegroundColor white " Error "
+                }
+                Write-Host -ForegroundColor Green " Done"
+            }
+            else { Write-Host -ForegroundColor Yellow " Already removed"}
+        }
+        else {
+            $currentTask =  $task.directory + "\" + $task.name
+            if(schtasks /Query /TN $currentTask 2>$null) {
+                Write-Host -NoNewline -ForegroundColor DarkGreen " found! "
+                Write-Host -Nonewline -ForegroundColor white "removing ... "
+                try{
+                    echo $yes | schtasks /Delete /TN $currentTask /F 2>$null
+                }
+                Catch {
+                    Write-Host -Nonewline -ForegroundColor white " Error "
+                }
+                Write-Host -ForegroundColor green "Done"
+
             }
             Write-Host -ForegroundColor Green " Done"
         }
@@ -63,13 +85,20 @@ function hide_update() {
                     Write-Host -ForegroundColor Yellow "Already hidden"
                 }
             }
-        }
+        }
         if (!$found){ Write-Host -ForegroundColor Red "Not found"}
     }
 }
-if (stop-process -name GWX -Force -ErrorAction SilentlyContinue) {
-    Write-Host "GWX process stopped ..."
+
+Write-Host -Nonewline -ForegroundColor white "Searching for GWX process ... "
+if (Get-Process -name GWX -ErrorAction SilentlyContinue}) {
+    Write-Host -ForegroundColor DarkGreen -NoNewLine "Running "
+    Write-Host -Nonewline -ForegroundColor white "removing ... "
+    Try {Stop-Process -name GWX -Force -ErrorAction SilentlyContinue}
+    Catch { Write-Host -ForegroundColor Red "Error"}
 }
+else { Write-Host -ForegroundColor Yellow ("Not running")}
+
 #Remove GWX Files (test)
 takeown /F "$env:WINDIR\System32\GWX" /R /D $yes
 icacls "$env:WINDIR\System32\GWX" /C /grant $adminGroup":F" /T
@@ -101,4 +130,4 @@ Write-Host "`nHiding Updates"
 Write-Host "--------------`n"
 
 hide_update $kbIDs
-remove_tasks $sheduledTasks
\ No newline at end of file
+remove_tasks $sheduledTasks