diff --git a/ua/registry/UAGRDEV-UNREGISTER.REG b/ua/registry/UAGRDEV-UNREGISTER.REG
new file mode 100644
index 0000000..8ae51b7
--- /dev/null
+++ b/ua/registry/UAGRDEV-UNREGISTER.REG
@@ -0,0 +1,26 @@
+Windows Registry Editor Version 5.00
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\LocalServer32]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\ProgID]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\Programmable]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\TypeLib]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\VersionIndependentProgID]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45b4-92BF-4582EA5C6F47}]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45b4-92BF-4582EA5C6F47}\ProxyStubClsid]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45b4-92BF-4582EA5C6F47}\ProxyStubClsid32]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45b4-92BF-4582EA5C6F47}\TypeLib]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\ProxyStubClsid]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\ProxyStubClsid32]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\TypeLib]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev\CLSID]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev\CurVer]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev.1]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev.1\CLSID]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0\win32]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\FLAGS]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\HELPDIR]
diff --git a/ua/registry/athena.classes.after.reg b/ua/registry/athena.classes.after.reg
deleted file mode 100644
index f094aed..0000000
Binary files a/ua/registry/athena.classes.after.reg and /dev/null differ
diff --git a/ua/registry/athena.classes.before.reg b/ua/registry/athena.classes.before.reg
deleted file mode 100644
index a747470..0000000
Binary files a/ua/registry/athena.classes.before.reg and /dev/null differ
diff --git a/ua/registry/qlogic-devapp-tool.ps1 b/ua/registry/qlogic-devapp-tool.ps1
index ce01193..61b7af3 100644
--- a/ua/registry/qlogic-devapp-tool.ps1
+++ b/ua/registry/qlogic-devapp-tool.ps1
@@ -55,28 +55,34 @@ switch ($airline) {
             'checkin' {
                 $appName = 'uasrdev'
                 $clsid = '35578409-F9F5-43e8-A6BD-8B77199ED854'
-                $appId = '91D04D72-DCB6-11D3-957D-00409500D5AD'
-                $classLabel = "QWDev Class"
-                $interfaceId = '6B15E61A-381F-41e7-8B65-BA386473FE8C'
-                $interfaceName = 'IQWDev'
-                $eventInterfaceId = '17DCFB07-18A9-4ffe-B34D-37B91D809C41'
-                $eventInterfaceName = '_IQWDevEvents'
-                $typeLibId='CD886C7B-B61C-49cf-B3B8-90DB303A502A'
+                $appId = 'C123476B-ABB6-4BCC-B557-2FDC0CDCD6A8'
+                $classLabel = 'QSRDev Class'
+                $interfaceId = '6B15E61A-381F-41E7-8B65-BA386473FE8C'
+                $interfaceName = 'IQSRDev'
+                $interfaceStubClsid = '00020424-0000-0000-C000-000000000046'
+                $eventInterfaceId = '17DCFB07-18A9-4FFE-B34D-37B91D809C41'
+                $eventInterfaceName = '_IQSRDevEvents'
+                $eventInterfaceStubClsid = '00020420-0000-0000-C000-000000000046'
+                $typeLibId='CD886C7B-B61C-49CF-B3B8-90DB303A502A'
                 $typeLibLabel = 'QSRDevice 1.0 Type Library'
-                $versionIndependentProgId = 'QSRDevice.QSRDev';
+                $typeLibVersion = '1.0'
+                $versionIndependentProgId = 'QSRDevice.QSRDev'
             }
             'gate' {
                 $appName = 'uagrdev'
                 $clsid = '3F52625C-F66C-43F5-B538-CDF7331E0B7D'
-                $appId = 'C123476B-ABB6-4bcc-B557-2FDC0CDCD6A8'
-                $classLabel = "QSRDev Class"
-                $interfaceId = 'D178FEAC-4969-45b4-92BF-4582EA5C6F47'
-                $interfaceName = 'IQSRDev'
+                $appId = '91D04D72-DCB6-11D3-957D-00409500D5AD'
+                $classLabel = 'QWDev Class'
+                $interfaceId = 'D178FEAC-4969-45B4-92BF-4582EA5C6F47'
+                $interfaceName = 'IQWDev'
+                $interfaceStubClsid = '00020424-0000-0000-C000-000000000046'
                 $eventInterfaceId = 'FDE206D5-EB3E-4DB1-AC3E-6CF314417443'
-                $eventInterfaceName = '_IQSRDevEvents'
+                $eventInterfaceName = '_IQWDevEvents'
+                $eventInterfaceStubClsid = '00020420-0000-0000-C000-000000000046'
                 $typeLibId='FB2C3447-9D8D-4AD0-9234-A163505FC3AE'
                 $typeLibLabel = 'QWDevice 1.0 Type Library'
-                $versionIndependentProgId = 'QWDevice.QWDev';
+                $typeLibVersion = '1.0'
+                $versionIndependentProgId = 'QWDevice.QWDev'
             }
         }
     }
@@ -85,6 +91,8 @@ switch ($airline) {
         exit 1
     }
 }
+$progId = "$versionIndependentProgId.1";
+
 
 switch ($action) {
     'createRegFiles' {
@@ -155,10 +163,6 @@ try {
     Write-Error "An error occurred trying to discover network path to COM server at $comPath"
 }
 
-$progId = "$versionIndependentProgId.1";
-$proxyStubClsid32 = '00020420-0000-0000-C000-000000000046'
-$typeLibVersion = '1.0'
-
 function Get-ClsidPaths {
     param(
         [Parameter(Mandatory=$true)]
@@ -206,13 +210,18 @@ function Get-ClsidPaths {
             Values = @(
                 @{
                     Name = '(default)'
-                    Value = $typeLibId
+                    Value = "{$typeLibId}"
                 }
             )
         },
         @{
             Key = "\SOFTWARE\Classes$($architectureNode)CLSID\{$clsid}\VersionIndependentProgID"
-            Values = @()
+            Values = @(
+                @{
+                    Name = '(default)'
+                    Value = $versionIndependentProgId
+                }
+            )
         }
     )
 }
@@ -238,7 +247,7 @@ function Get-InterfacePaths {
             Values = @(
                 @{
                     Name = '(default)'
-                    Value = "{$proxyStubClsid32}"
+                    Value = "{$interfaceStubClsid}"
                 }
             )
         },
@@ -251,7 +260,8 @@ function Get-InterfacePaths {
                 },
                 @{
                     Name = 'Version'
-                    Value = $typeLibVersion }
+                    Value = $typeLibVersion
+                }
             )
         },
         @{
@@ -268,7 +278,7 @@ function Get-InterfacePaths {
             Values = @(
                 @{
                     Name = '(default)'
-                    Value = "{$proxyStubClsid32}"
+                    Value = "{$eventInterfaceStubClsid}"
                 }
             )
         },
@@ -290,33 +300,6 @@ function Get-InterfacePaths {
 
 function Get-ProgIdPaths {
     return @(
-        @{
-            Key = "\SOFTWARE\Classes\$progId"
-            Values = @(
-                @{
-                    Name = '(default)'
-                    Value = $classLabel
-                }
-            )
-        },
-        @{
-            Key = "\SOFTWARE\Classes\$progId\CLSID"
-            Values = @(
-                @{
-                    Name = '(default)'
-                    Value = "{$clsid}"
-                }
-            )
-        },
-        @{
-            Key = "\SOFTWARE\Classes\$progId\CurVer"
-            Values = @(
-                @{
-                    Name = '(default)'
-                    Value = $versionIndependentProgId
-                }
-            )
-        },
         @{
             Key = "\SOFTWARE\Classes\$versionIndependentProgId"
             Values = @(
@@ -334,6 +317,33 @@ function Get-ProgIdPaths {
                     Value = "{$clsid}"
                 }
             )
+        },
+        @{
+            Key = "\SOFTWARE\Classes\$versionIndependentProgId\CurVer"
+            Values = @(
+                @{
+                    Name = '(default)'
+                    Value = $progId
+                }
+            )
+        }
+        @{
+            Key = "\SOFTWARE\Classes\$progId"
+            Values = @(
+                @{
+                    Name = '(default)'
+                    Value = $classLabel
+                }
+            )
+        },
+        @{
+            Key = "\SOFTWARE\Classes\$progId\CLSID"
+            Values = @(
+                @{
+                    Name = '(default)'
+                    Value = "{$clsid}"
+                }
+            )
         }
     )
 }
@@ -402,7 +412,7 @@ function Get-Paths {
     if ($env:PROCESSOR_ARCHITECTURE -eq 'x86') {
         $wow6432Node = '\'
     } else {
-        $wow6432Node = '\Wow6432Node\'
+        $wow6432Node = '\WOW6432Node\'
     }
 
     $paths = New-Object System.Collections.Generic.List[System.Object]
diff --git a/ua/registry/uagrdev-add.reg b/ua/registry/uagrdev-add.reg
new file mode 100644
index 0000000..3541f54
--- /dev/null
+++ b/ua/registry/uagrdev-add.reg
@@ -0,0 +1,106 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev]
+@="QWDev Class"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev\CLSID]
+@="{3F52625C-F66C-43F5-B538-CDF7331E0B7D}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev\CurVer]
+@="QWDevice.QWDev.1"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev.1]
+@="QWDev Class"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev.1\CLSID]
+@="{3F52625C-F66C-43F5-B538-CDF7331E0B7D}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}]
+@="QWDev Class"
+"AppID"="{91D04D72-DCB6-11D3-957D-00409500D5AD}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\LocalServer32]
+@="C:\\temp\\ua\\UA-SUITE\\39.1.3\\UAGRDEV\\6.0-cute\\uagrdevs.exe"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\ProgID]
+@="QWDevice.QWDev.1"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\Programmable]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\TypeLib]
+@="{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\VersionIndependentProgID]
+@="QWDevice.QWDev"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}]
+@="IQWDev"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\ProxyStubClsid32]
+@="{00020424-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\TypeLib]
+@="{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}]
+@="_IQWDevEvents"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\ProxyStubClsid32]
+@="{00020420-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\TypeLib]
+@="{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0]
+@="QWDevice 1.0 Type Library"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0\win32]
+@="C:\\temp\\ua\\UA-SUITE\\39.1.3\\UAGRDEV\\6.0-cute\\uagrdevs.exe"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\FLAGS]
+@="0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\HELPDIR]
+@="C:\\temp\\ua\\UA-SUITE\\39.1.3\\UAGRDEV\\6.0-cute\\"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}]
+@="IQWDev"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\ProxyStubClsid32]
+@="{00020424-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\TypeLib]
+@="{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}]
+@="_IQWDevEvents"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\ProxyStubClsid32]
+@="{00020420-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\TypeLib]
+@="{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0]
+@="QWDevice 1.0 Type Library"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0\win32]
+@="C:\\temp\\ua\\UA-SUITE\\39.1.3\\UAGRDEV\\6.0-cute\\uagrdevs.exe"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\FLAGS]
+@="0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\HELPDIR]
+@="C:\\temp\\ua\\UA-SUITE\\39.1.3\\UAGRDEV\\6.0-cute\\"
diff --git a/ua/registry/uagrdev-del.reg b/ua/registry/uagrdev-del.reg
new file mode 100644
index 0000000..7c444d9
--- /dev/null
+++ b/ua/registry/uagrdev-del.reg
@@ -0,0 +1,36 @@
+Windows Registry Editor Version 5.00
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev\CLSID]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev\CurVer]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev.1]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev.1\CLSID]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\LocalServer32]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\ProgID]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\Programmable]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\TypeLib]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\VersionIndependentProgID]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\ProxyStubClsid32]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\TypeLib]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\ProxyStubClsid32]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\TypeLib]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0\win32]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\FLAGS]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\HELPDIR]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\ProxyStubClsid32]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\TypeLib]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\ProxyStubClsid32]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\TypeLib]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0\win32]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\FLAGS]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\HELPDIR]
diff --git a/ua/registry/uagrdev.reg copy.diff b/ua/registry/uagrdev.reg copy.diff
new file mode 100644
index 0000000..b314825
--- /dev/null
+++ b/ua/registry/uagrdev.reg copy.diff	
@@ -0,0 +1,104 @@
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev]
+@="QWDev Class"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev\CLSID]
+@="{3F52625C-F66C-43F5-B538-CDF7331E0B7D}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev\CurVer]
+@="QWDevice.QWDev.1"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev.1]
+@="QWDev Class"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev.1\CLSID]
+@="{3F52625C-F66C-43F5-B538-CDF7331E0B7D}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}]
+@="QWDev Class"
+"AppID"="{91D04D72-DCB6-11D3-957D-00409500D5AD}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\LocalServer32]
+@="\"C:\\temp\\ua\\UA-SUITE\\39.11\\UAGRDEV\\cupps\\622FEC~1.1\\UAGRDEVQ.EXE\""
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\ProgID]
+@="QWDevice.QWDev.1"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\Programmable]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\TypeLib]
+@="{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\VersionIndependentProgID]
+@="QWDevice.QWDev"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}]
+@="IQWDev"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\ProxyStubClsid32]
+@="{00020424-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\TypeLib]
+@="{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}]
+@="_IQWDevEvents"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\ProxyStubClsid32]
+@="{00020420-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\TypeLib]
+@="{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0]
+@="QWDevice 1.0 Type Library"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0\win32]
+@="C:\\temp\\ua\\UA-SUITE\\39.11\\UAGRDEV\\cupps\\6.2.1\\UAGRDEVQ.EXE"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\FLAGS]
+@="0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\HELPDIR]
+@="C:\\temp\\ua\\UA-SUITE\\39.11\\UAGRDEV\\cupps\\6.2.1\\"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}]
+@="IQWDev"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\ProxyStubClsid32]
+@="{00020424-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\TypeLib]
+@="{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}]
+@="_IQWDevEvents"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\ProxyStubClsid32]
+@="{00020420-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\TypeLib]
+@="{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0]
+@="QWDevice 1.0 Type Library"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0\win32]
+@="C:\\temp\\ua\\UA-SUITE\\39.11\\UAGRDEV\\cupps\\6.2.1\\UAGRDEVQ.EXE"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\FLAGS]
+@="0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\HELPDIR]
+@="C:\\temp\\ua\\UA-SUITE\\39.11\\UAGRDEV\\cupps\\6.2.1\\"
diff --git a/ua/registry/uagrdev.reg.diff b/ua/registry/uagrdev.reg.diff
new file mode 100644
index 0000000..fc2bae0
--- /dev/null
+++ b/ua/registry/uagrdev.reg.diff
@@ -0,0 +1,104 @@
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}]
+@="IQWDev"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\ProxyStubClsid32]
+@="{00020424-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\TypeLib]
+@="{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}]
+@="_IQWDevEvents"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\ProxyStubClsid32]
+@="{00020420-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\TypeLib]
+@="{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev]
+@="QWDev Class"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev\CLSID]
+@="{3F52625C-F66C-43F5-B538-CDF7331E0B7D}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev\CurVer]
+@="QWDevice.QWDev.1"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev.1]
+@="QWDev Class"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QWDevice.QWDev.1\CLSID]
+@="{3F52625C-F66C-43F5-B538-CDF7331E0B7D}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0]
+@="QWDevice 1.0 Type Library"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0\win32]
+@="C:\\temp\\ua\\UA-SUITE\\39.11\\UAGRDEV\\cupps\\6.2.1\\UAGRDEVQ.EXE"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\FLAGS]
+@="0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\HELPDIR]
+@="C:\\temp\\ua\\UA-SUITE\\39.11\\UAGRDEV\\cupps\\6.2.1\\"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}]
+@="QWDev Class"
+"AppID"="{91D04D72-DCB6-11D3-957D-00409500D5AD}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\LocalServer32]
+@="\"C:\\temp\\ua\\UA-SUITE\\39.11\\UAGRDEV\\cupps\\622FEC~1.1\\UAGRDEVQ.EXE\""
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\ProgID]
+@="QWDevice.QWDev.1"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\Programmable]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\TypeLib]
+@="{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{3F52625C-F66C-43F5-B538-CDF7331E0B7D}\VersionIndependentProgID]
+@="QWDevice.QWDev"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}]
+@="IQWDev"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\ProxyStubClsid32]
+@="{00020424-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{D178FEAC-4969-45B4-92BF-4582EA5C6F47}\TypeLib]
+@="{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}]
+@="_IQWDevEvents"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\ProxyStubClsid32]
+@="{00020420-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{FDE206D5-EB3E-4DB1-AC3E-6CF314417443}\TypeLib]
+@="{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0]
+@="QWDevice 1.0 Type Library"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\0\win32]
+@="C:\\temp\\ua\\UA-SUITE\\39.11\\UAGRDEV\\cupps\\6.2.1\\UAGRDEVQ.EXE"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\FLAGS]
+@="0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{FB2C3447-9D8D-4AD0-9234-A163505FC3AE}\1.0\HELPDIR]
+@="C:\\temp\\ua\\UA-SUITE\\39.11\\UAGRDEV\\cupps\\6.2.1\\"
diff --git a/ua/registry/uasrdev-add-manual.reg b/ua/registry/uasrdev-add-manual.reg
new file mode 100644
index 0000000..daf1879
--- /dev/null
+++ b/ua/registry/uasrdev-add-manual.reg
@@ -0,0 +1,78 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QSRDevice.QSRDev]
+@="QSRDev Class"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QSRDevice.QSRDev\CLSID]
+@="{35578409-F9F5-43e8-A6BD-8B77199ED854}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QSRDevice.QSRDev\CurVer]
+@="QSRDevice.QSRDev.1"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QSRDevice.QSRDev.1]
+@="QSRDev Class"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QSRDevice.QSRDev.1\CLSID]
+@="{35578409-F9F5-43e8-A6BD-8B77199ED854}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{35578409-F9F5-43e8-A6BD-8B77199ED854}]
+@="QSRDev Class"
+"AppID"="{C123476B-ABB6-4bcc-B557-2FDC0CDCD6A8}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{35578409-F9F5-43e8-A6BD-8B77199ED854}\LocalServer32]
+@="M:\\users\\ua\\ua-suite\\1.6a\\UASRDEV\\2.4.0.1\\UASRDEVA.EXE"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{35578409-F9F5-43e8-A6BD-8B77199ED854}\ProgID]
+@="QSRDevice.QSRDev.1"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{35578409-F9F5-43e8-A6BD-8B77199ED854}\Programmable]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{35578409-F9F5-43e8-A6BD-8B77199ED854}\TypeLib]
+@="{CD886C7B-B61C-49cf-B3B8-90DB303A502A}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{35578409-F9F5-43e8-A6BD-8B77199ED854}\VersionIndependentProgID]
+@="QSRDevice.QSRDev"
+6B15E61A-381F-41e7-8B65-BA386473FE8C
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{6B15E61A-381F-41e7-8B65-BA386473FE8C}]
+@="IQSRDev"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{6B15E61A-381F-41e7-8B65-BA386473FE8C}\ProxyStubClsid]
+@="{00020424-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{6B15E61A-381F-41e7-8B65-BA386473FE8C}\ProxyStubClsid32]
+@="{00020424-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{6B15E61A-381F-41e7-8B65-BA386473FE8C}\TypeLib]
+@="{CD886C7B-B61C-49cf-B3B8-90DB303A502A}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{17DCFB07-18A9-4ffe-B34D-37B91D809C41}]
+@="_IQSRDevEvents"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{17DCFB07-18A9-4ffe-B34D-37B91D809C41}\ProxyStubClsid]
+@="{00020420-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{17DCFB07-18A9-4ffe-B34D-37B91D809C41}\ProxyStubClsid32]
+@="{00020420-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{17DCFB07-18A9-4ffe-B34D-37B91D809C41}\TypeLib]
+@="{CD886C7B-B61C-49cf-B3B8-90DB303A502A}"
+"Version"="1.0"
+
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49cf-B3B8-90DB303A502A}]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49cf-B3B8-90DB303A502A}\1.0]
+@="QSRDevice 1.0 Type Library"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49cf-B3B8-90DB303A502A}\1.0\0]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49cf-B3B8-90DB303A502A}\1.0\0\win32]
+@="M:\\users\\ua\\ua-suite\\1.6a\\UASRDEV\\2.4.0.1\\UASRDEVA.EXE"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49cf-B3B8-90DB303A502A}\1.0\FLAGS]
+@="0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49cf-B3B8-90DB303A502A}\1.0\HELPDIR]
+@="M:\\users\\ua\\ua-suite\\1.6a\\UASRDEV\\2.4.0.1\\"
+
diff --git a/ua/registry/uasrdev-add.reg b/ua/registry/uasrdev-add.reg
index f76b790..c409710 100644
Binary files a/ua/registry/uasrdev-add.reg and b/ua/registry/uasrdev-add.reg differ
diff --git a/ua/registry/uasrdev-del.reg b/ua/registry/uasrdev-del.reg
index e1d4a7c..7bdb57a 100644
Binary files a/ua/registry/uasrdev-del.reg and b/ua/registry/uasrdev-del.reg differ
diff --git a/ua/registry/athena.uasrdevs.reg.diff b/ua/registry/uasrdev.reg copy.diff
similarity index 99%
rename from ua/registry/athena.uasrdevs.reg.diff
rename to ua/registry/uasrdev.reg copy.diff
index 16e9060..493e23e 100644
--- a/ua/registry/athena.uasrdevs.reg.diff
+++ b/ua/registry/uasrdev.reg copy.diff	
@@ -1,25 +1,3 @@
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}]
-@="_IQSRDevEvents"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}\ProxyStubClsid32]
-@="{00020420-0000-0000-C000-000000000046}"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}\TypeLib]
-@="{CD886C7B-B61C-49CF-B3B8-90DB303A502A}"
-"Version"="1.0"
-
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{6B15E61A-381F-41E7-8B65-BA386473FE8C}]
-@="IQSRDev"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{6B15E61A-381F-41E7-8B65-BA386473FE8C}\ProxyStubClsid32]
-@="{00020424-0000-0000-C000-000000000046}"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{6B15E61A-381F-41E7-8B65-BA386473FE8C}\TypeLib]
-@="{CD886C7B-B61C-49CF-B3B8-90DB303A502A}"
-"Version"="1.0"
-
-
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QSRDevice.QSRDev]
 @="QSRDev Class"
 
@@ -35,24 +13,6 @@
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QSRDevice.QSRDev.1\CLSID]
 @="{35578409-F9F5-43e8-A6BD-8B77199ED854}"
 
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}]
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0]
-@="QSRDevice 1.0 Type Library"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\0]
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\0\win32]
-@="C:\\temp\\UA\\UA-SUITE\\39.11\\UASRDEV\\cupps\\6.0.3\\UASRDEVQ.EXE"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\FLAGS]
-@="0"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\HELPDIR]
-@="C:\\temp\\UA\\UA-SUITE\\39.11\\UASRDEV\\cupps\\6.0.3\\"
-
-
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{35578409-F9F5-43e8-A6BD-8B77199ED854}]
 @="QSRDev Class"
 "AppID"="{C123476B-ABB6-4bcc-B557-2FDC0CDCD6A8}"
@@ -71,18 +31,6 @@
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{35578409-F9F5-43e8-A6BD-8B77199ED854}\VersionIndependentProgID]
 @="QSRDevice.QSRDev"
 
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}]
-@="_IQSRDevEvents"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}\ProxyStubClsid32]
-@="{00020420-0000-0000-C000-000000000046}"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}\TypeLib]
-@="{CD886C7B-B61C-49CF-B3B8-90DB303A502A}"
-"Version"="1.0"
-
-
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{6B15E61A-381F-41E7-8B65-BA386473FE8C}]
 @="IQSRDev"
 
@@ -93,6 +41,15 @@
 @="{CD886C7B-B61C-49CF-B3B8-90DB303A502A}"
 "Version"="1.0"
 
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}]
+@="_IQSRDevEvents"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}\ProxyStubClsid32]
+@="{00020420-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}\TypeLib]
+@="{CD886C7B-B61C-49CF-B3B8-90DB303A502A}"
+"Version"="1.0"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}]
 
@@ -108,4 +65,40 @@
 @="0"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\HELPDIR]
+@="C:\\temp\\UA\\UA-SUITE\\39.11\\UASRDEV\\cupps\\6.0.3\\"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{6B15E61A-381F-41E7-8B65-BA386473FE8C}]
+@="IQSRDev"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{6B15E61A-381F-41E7-8B65-BA386473FE8C}\ProxyStubClsid32]
+@="{00020424-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{6B15E61A-381F-41E7-8B65-BA386473FE8C}\TypeLib]
+@="{CD886C7B-B61C-49CF-B3B8-90DB303A502A}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}]
+@="_IQSRDevEvents"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}\ProxyStubClsid32]
+@="{00020420-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}\TypeLib]
+@="{CD886C7B-B61C-49CF-B3B8-90DB303A502A}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0]
+@="QSRDevice 1.0 Type Library"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\0]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\0\win32]
+@="C:\\temp\\UA\\UA-SUITE\\39.11\\UASRDEV\\cupps\\6.0.3\\UASRDEVQ.EXE"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\FLAGS]
+@="0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\HELPDIR]
 @="C:\\temp\\UA\\UA-SUITE\\39.11\\UASRDEV\\cupps\\6.0.3\\"
\ No newline at end of file
diff --git a/ua/registry/prometheus.uasrdevs.reg.diff b/ua/registry/uasrdev.reg.diff
similarity index 74%
rename from ua/registry/prometheus.uasrdevs.reg.diff
rename to ua/registry/uasrdev.reg.diff
index 32057b1..b3eec60 100644
--- a/ua/registry/prometheus.uasrdevs.reg.diff
+++ b/ua/registry/uasrdev.reg.diff
@@ -1,3 +1,23 @@
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}]
+@="_IQSRDevEvents"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}\ProxyStubClsid32]
+@="{00020420-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}\TypeLib]
+@="{CD886C7B-B61C-49CF-B3B8-90DB303A502A}"
+"Version"="1.0"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{6B15E61A-381F-41E7-8B65-BA386473FE8C}]
+@="IQSRDev"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{6B15E61A-381F-41E7-8B65-BA386473FE8C}\ProxyStubClsid32]
+@="{00020424-0000-0000-C000-000000000046}"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{6B15E61A-381F-41E7-8B65-BA386473FE8C}\TypeLib]
+@="{CD886C7B-B61C-49CF-B3B8-90DB303A502A}"
+"Version"="1.0"
+
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QSRDevice.QSRDev]
 @="QSRDev Class"
 
@@ -13,8 +33,6 @@
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\QSRDevice.QSRDev.1\CLSID]
 @="{35578409-F9F5-43e8-A6BD-8B77199ED854}"
 
-
-
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}]
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0]
@@ -23,22 +41,20 @@
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\0]
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\0\win32]
-@="C:\\temp\\ua\\UA-SUITE\\39.1.2\\UASRDEV\\6.0-cute\\UASRDEVS.EXE"
+@="C:\\temp\\UA\\UA-SUITE\\39.11\\UASRDEV\\cupps\\6.0.3\\UASRDEVQ.EXE"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\FLAGS]
 @="0"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\HELPDIR]
-@="C:\\temp\\ua\\UA-SUITE\\39.1.2\\UASRDEV\\6.0-cute\\"
-
-
+@="C:\\temp\\UA\\UA-SUITE\\39.11\\UASRDEV\\cupps\\6.0.3\\"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{35578409-F9F5-43e8-A6BD-8B77199ED854}]
 @="QSRDev Class"
 "AppID"="{C123476B-ABB6-4bcc-B557-2FDC0CDCD6A8}"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{35578409-F9F5-43e8-A6BD-8B77199ED854}\LocalServer32]
-@="\"C:\\temp\\ua\\UA-SUITE\\391~1.2\\UASRDEV\\6BEB7~1.0-C\\UASRDEVS.EXE\""
+@="\"C:\\temp\\UA\\UA-SUITE\\39.11\\UASRDEV\\cupps\\60985B~1.3\\UASRDEVQ.EXE\""
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{35578409-F9F5-43e8-A6BD-8B77199ED854}\ProgID]
 @="QSRDevice.QSRDev.1"
@@ -51,8 +67,6 @@
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\CLSID\{35578409-F9F5-43e8-A6BD-8B77199ED854}\VersionIndependentProgID]
 @="QSRDevice.QSRDev"
 
-
-
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{17DCFB07-18A9-4FFE-B34D-37B91D809C41}]
 @="_IQSRDevEvents"
 
@@ -63,8 +77,6 @@
 @="{CD886C7B-B61C-49CF-B3B8-90DB303A502A}"
 "Version"="1.0"
 
-
-
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\Interface\{6B15E61A-381F-41E7-8B65-BA386473FE8C}]
 @="IQSRDev"
 
@@ -75,8 +87,6 @@
 @="{CD886C7B-B61C-49CF-B3B8-90DB303A502A}"
 "Version"="1.0"
 
-
-
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}]
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0]
@@ -85,10 +95,10 @@
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\0]
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\0\win32]
-@="C:\\temp\\ua\\UA-SUITE\\39.1.2\\UASRDEV\\6.0-cute\\UASRDEVS.EXE"
+@="C:\\temp\\UA\\UA-SUITE\\39.11\\UASRDEV\\cupps\\6.0.3\\UASRDEVQ.EXE"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\FLAGS]
 @="0"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\WOW6432Node\TypeLib\{CD886C7B-B61C-49CF-B3B8-90DB303A502A}\1.0\HELPDIR]
-@="C:\\temp\\ua\\UA-SUITE\\39.1.2\\UASRDEV\\6.0-cute\\"
\ No newline at end of file
+@="C:\\temp\\UA\\UA-SUITE\\39.11\\UASRDEV\\cupps\\6.0.3\\"
\ No newline at end of file