diff --git a/WAPT/control b/WAPT/control
index cad7c64..8942e1a 100644
--- a/WAPT/control
+++ b/WAPT/control
@@ -1,5 +1,5 @@
 package           : fws-system-settings
-version           : 3
+version           : 4
 architecture      : all
 section           : base
 priority          : optional
diff --git a/setup.py b/setup.py
index 3f2aa4e..34c0e35 100644
--- a/setup.py
+++ b/setup.py
@@ -40,8 +40,12 @@ def install():
     run(r'net user rv /add', accept_returncodes=[0,2])
     run(r'net localgroup Administrateurs rv /add', accept_returncodes=[0,2])
 
-    print('Disabling P2P updates delivery')
-    registry_setstring(HKEY_LOCAL_MACHINE, r'SOFTWARE\Policies\Microsoft\Windows\DeliveryOptimization', 'DODownloadMode', 0, REG_DWORD)
+    if windows_version() > Version('10'):
+        print('Disabling P2P updates delivery')
+        registry_setstring(HKEY_LOCAL_MACHINE, r'SOFTWARE\Policies\Microsoft\Windows\DeliveryOptimization', 'DODownloadMode', 0, REG_DWORD)
+        print('Disabling Cortana')
+        registry_set(HKEY_LOCAL_MACHINE, r'SOFTWARE\Policies\Microsoft\Windows\Windows Search', r'AllowCortana', 0, REG_DWORD)
+        remove_metroapp('Microsoft.Windows.Cortana')
 
 def uninstall():
     print('Re enabling services')