diff --git a/.gitignore b/.gitignore
index 614b6a7..cca08d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -266,3 +266,5 @@ paket-files/
 *.wixobj
 
 /OCAT-Installer/redist
+/GameOverlay/vulkan/src/vk.xml
+/GameOverlay/vulkan/src/vk_dispatch_defs.h
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e637da7..92a482f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 variables:
   PLATFORM_TOOLSET: v141
-  OCAT_VERSION: 1.6.1
+  OCAT_VERSION: 1.6.2
 
 stages:
   - build
diff --git a/.mailmap b/.mailmap
deleted file mode 100644
index 42b9f15..0000000
--- a/.mailmap
+++ /dev/null
@@ -1 +0,0 @@
-dbaumeister <domi@baumis.eu> amddb <dbaumeis@amd.com>
\ No newline at end of file
diff --git a/COPYING b/COPYING
deleted file mode 100644
index b734541..0000000
--- a/COPYING
+++ /dev/null
@@ -1 +0,0 @@
-See docs/source/license.rst for license information.
\ No newline at end of file
diff --git a/Commons/Commons.vcxproj b/Commons/Commons.vcxproj
index fb89500..bcbd07b 100644
--- a/Commons/Commons.vcxproj
+++ b/Commons/Commons.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Config\BlackList.cpp" />
+    <ClCompile Include="Config\DenyList.cpp" />
     <ClCompile Include="Config\Config.cpp" />
     <ClCompile Include="Logging\MessageLog.cpp" />
     <ClCompile Include="Overlay\DLLInjection.cpp" />
@@ -45,7 +45,7 @@
     <ClCompile Include="Utility\StringUtils.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Config\BlackList.h" />
+    <ClInclude Include="Config\DenyList.h" />
     <ClInclude Include="Config\Config.h" />
     <ClInclude Include="Logging\MessageLog.h" />
     <ClInclude Include="Overlay\DLLInjection.h" />
@@ -77,20 +77,20 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{62089454-A7BA-4416-9E4B-EB0085797582}</ProjectGuid>
     <RootNamespace>Commons</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>false</CLRSupport>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>false</CLRSupport>
@@ -98,14 +98,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>false</CLRSupport>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>false</CLRSupport>
diff --git a/Commons/Commons.vcxproj.filters b/Commons/Commons.vcxproj.filters
index cb3140b..ca6c1ba 100644
--- a/Commons/Commons.vcxproj.filters
+++ b/Commons/Commons.vcxproj.filters
@@ -63,7 +63,7 @@
     <ClCompile Include="Utility\ProcessTermination.cpp">
       <Filter>Utility</Filter>
     </ClCompile>
-    <ClCompile Include="Config\BlackList.cpp">
+    <ClCompile Include="Config\DenyList.cpp">
       <Filter>Config</Filter>
     </ClCompile>
     <ClCompile Include="Config\Config.cpp">
@@ -140,7 +140,7 @@
     <ClInclude Include="Utility\ProcessTermination.h">
       <Filter>Utility</Filter>
     </ClInclude>
-    <ClInclude Include="Config\BlackList.h">
+    <ClInclude Include="Config\DenyList.h">
       <Filter>Config</Filter>
     </ClInclude>
     <ClInclude Include="Config\Config.h">
diff --git a/Commons/Config/BlackList.cpp b/Commons/Config/DenyList.cpp
similarity index 69%
rename from Commons/Config/BlackList.cpp
rename to Commons/Config/DenyList.cpp
index 0015db5..8c7d236 100644
--- a/Commons/Config/BlackList.cpp
+++ b/Commons/Config/DenyList.cpp
@@ -20,7 +20,7 @@
 // SOFTWARE.
 //
 
-#include "BlackList.h"
+#include "DenyList.h"
 #include "../Utility/ProcessHelper.h"
 #include "../Utility/FileDirectory.h"
 #include "../Logging/MessageLog.h"
@@ -28,66 +28,66 @@
 
 #include <fstream>
 
-void BlackList::Load()
+void DenyList::Load()
 {
   if (loaded_) return;
 
-  const std::wstring defaultBlackList =
-    g_fileDirectory.GetDirectory(DirectoryType::Config) + L"defaultBlackList.txt";
+  const std::wstring defaultDenyList =
+    g_fileDirectory.GetDirectory(DirectoryType::Config) + L"defaultDenyList.txt";
 
-  std::wifstream file(defaultBlackList);
+  std::wifstream file(defaultDenyList);
   if (file.is_open())
   {
     // check for version number
-    // if we know app version and it differs from default blacklist version -> update
+    // if we know app version and it differs from default denylist version -> update
     std::wstring version;
     std::getline(file, version);
     if (version_.empty() || ConvertUTF16StringToUTF8String(version).compare(version_) == 0)
     {
-      // at this point the correct version number should be the one parsed from the blackList file
+      // at this point the correct version number should be the one parsed from the denyList file
       version_ = ConvertUTF16StringToUTF8String(version);
       for (std::wstring line; std::getline(file, line);)
       {
-        blackList_.push_back(line);
+        denyList_.push_back(line);
       }
-      g_messageLog.LogInfo("BlackList", "Blacklist file loaded");
+      g_messageLog.LogInfo("DenyList", "Denylist file loaded");
     }
     else {
       file.close();
-      CreateDefault(defaultBlackList);
+      CreateDefault(defaultDenyList);
     }
   }
   else
   {
-    CreateDefault(defaultBlackList);
+    CreateDefault(defaultDenyList);
   }
 
-  const std::wstring userBlackList =
-    g_fileDirectory.GetDirectory(DirectoryType::Config) + L"userBlackList.txt";
-  std::wifstream userfile(userBlackList);
+  const std::wstring userDenyList =
+    g_fileDirectory.GetDirectory(DirectoryType::Config) + L"userDenyList.txt";
+  std::wifstream userfile(userDenyList);
   if (userfile.is_open())
   {
     for (std::wstring line; std::getline(userfile, line);)
     {
-      blackList_.push_back(line);
+      denyList_.push_back(line);
     }
-    g_messageLog.LogInfo("BlackList", "Blacklist file loaded");
+    g_messageLog.LogInfo("DenyList", "Denylist file loaded");
   }
   else {
-    CreateUserBlackList(userBlackList);
+    CreateUserDenyList(userDenyList);
   }
 
   loaded_ = true;
 }
 
-bool BlackList::Contains(const std::wstring& value) const
+bool DenyList::Contains(const std::wstring& value) const
 {
   // ignore system processes without names
   if (value.empty()) {
     return true;
   }
 
-  for (auto& entry : blackList_) {
+  for (auto& entry : denyList_) {
     if (_wcsicmp(entry.c_str(), value.c_str()) == 0) {
       return true;
     }
@@ -95,23 +95,23 @@ bool BlackList::Contains(const std::wstring& value) const
   return false;
 }
 
-std::vector<std::string> BlackList::GetBlackList()
+std::vector<std::string> DenyList::GetDenyList()
 {
-  std::vector<std::string> blackList;
-  blackList.reserve(blackList_.size());
-  for (const auto& item : blackList_)
+  std::vector<std::string> denyList;
+  denyList.reserve(denyList_.size());
+  for (const auto& item : denyList_)
   {
-    blackList.push_back(ConvertUTF16StringToUTF8String(item));
+    denyList.push_back(ConvertUTF16StringToUTF8String(item));
   }
-  return blackList;
+  return denyList;
 }
 
-void BlackList::CreateDefault(const std::wstring& fileName)
+void DenyList::CreateDefault(const std::wstring& fileName)
 {
-  g_messageLog.LogInfo("BlackList", "Create default blackList file");
+  g_messageLog.LogInfo("DenyList", "Create default denyList file");
 
   /* TODO: properly separate and document this list */
-  blackList_ = {ConvertUTF8StringToUTF16String(version_),
+  denyList_ = {ConvertUTF8StringToUTF16String(version_),
       L"dwm.exe", L"explorer.exe", L"firefox.exe",
       L"chrome.exe", L"taskhostw.exe", L"notepad.exe", 
       L"RadeonSettings.exe", L"Nvidia Share.exe", L"devenv.exe", L"Outlook.exe", L"Excel.exe",
@@ -123,26 +123,26 @@ void BlackList::CreateDefault(const std::wstring& fileName)
       L"OculusClient.exe", L"IAStorIcon.exe", L"conhost.exe", L"Agent.exe", L"Slack.exe",
       L"Code.exe", L"powershell.exe", L"python.exe", L"conda.exe", L"wmic.exe", L"onenote.exe",
       L"SearchProtocolHost.exe", L"lync.exe", L"taskmgr.exe", L"teams.exe", L"SpeechRuntime.exe",
-      L"ApplicationFrameHost.exe", L"LogonUI.exe", L"winword.exe" , L"powerpnt.exe"
+      L"ApplicationFrameHost.exe", L"LogonUI.exe", L"winword.exe" , L"powerpnt.exe", L"Launcher.exe"
       };
 
   std::wofstream file(fileName);
   if (file.is_open())
   {
-    for (auto& value : blackList_)
+    for (auto& value : denyList_)
     {
       file << value << std::endl;
     }
   }
   else
   {
-    g_messageLog.LogError("BlackList", "Unable to create default blackList file");
+    g_messageLog.LogError("DenyList", "Unable to create default denyList file");
   }
 }
 
-void BlackList::CreateUserBlackList(const std::wstring& fileName)
+void DenyList::CreateUserDenyList(const std::wstring& fileName)
 {
-  g_messageLog.LogInfo("BlackList", "Create user blackList file");
+  g_messageLog.LogInfo("DenyList", "Create user denyList file");
   std::wofstream file(fileName);
   if (file.is_open())
   {
@@ -150,6 +150,6 @@ void BlackList::CreateUserBlackList(const std::wstring& fileName)
   }
   else
   {
-    g_messageLog.LogError("BlackList", "Unable to create user blackList file");
+    g_messageLog.LogError("DenyList", "Unable to create user denyList file");
   }
 }
diff --git a/Commons/Config/BlackList.h b/Commons/Config/DenyList.h
similarity index 86%
rename from Commons/Config/BlackList.h
rename to Commons/Config/DenyList.h
index 03d9933..74cf1b8 100644
--- a/Commons/Config/BlackList.h
+++ b/Commons/Config/DenyList.h
@@ -26,20 +26,20 @@
 #include <vector>
 #include <string>
 
-class BlackList
+class DenyList
 {
 public:
-  // Tries to load the black list, creates a default file if none is found
+  // Tries to load the deny list, creates a default file if none is found
   void Load();
   bool Contains(const std::wstring& value) const;
-  std::vector<std::string> GetBlackList();
+  std::vector<std::string> GetDenyList();
   void SetVersion(std::string version) { version_ = version; }
   std::string GetVersion() { return version_; }
 
 private:
   void CreateDefault(const std::wstring& fileName);
-  void CreateUserBlackList(const std::wstring& fileName);
+  void CreateUserDenyList(const std::wstring& fileName);
   bool loaded_ = false;
-  std::vector<std::wstring> blackList_;
+  std::vector<std::wstring> denyList_;
   std::string version_;
 };
\ No newline at end of file
diff --git a/Commons/Overlay/Overlay.cpp b/Commons/Overlay/Overlay.cpp
index f9a2263..3b2cba9 100644
--- a/Commons/Overlay/Overlay.cpp
+++ b/Commons/Overlay/Overlay.cpp
@@ -43,9 +43,10 @@ Overlay::Overlay()
 
 typedef LONG(*PStartUWPProcessWithOverlay) (const wchar_t*);
 
-bool Overlay::StartProcess(const std::wstring& path, std::wstring& cmdArgs, bool enableOverlay)
+bool Overlay::StartProcess(const std::wstring& path, const std::wstring& workingDirectory, std::wstring& cmdArgs, bool enableOverlay)
 {
-  const auto processStartedStatus = CreateDesktopProcess(path, cmdArgs, enableOverlay);
+  const auto processStartedStatus =
+      CreateDesktopProcess(path, workingDirectory, cmdArgs, enableOverlay);
   // UWP app detected
   if (processStartedStatus == ERROR_APPCONTAINER_REQUIRED)
   {
@@ -107,11 +108,19 @@ const DWORD Overlay::GetProcessID() const
   return processID_;
 }
 
-DWORD Overlay::CreateDesktopProcess(const std::wstring& path, std::wstring& cmdArgs, bool enableOverlay)
+DWORD Overlay::CreateDesktopProcess(const std::wstring& path, const std::wstring& workingDirectory, std::wstring& cmdArgs, bool enableOverlay)
 {
   g_messageLog.LogInfo("Overlay",
     L"Trying to start executable " + path + L" cmdArgs " + cmdArgs);
-  const auto directory = GetDirFromPathSlashes(path);
+  std::wstring directory;
+  if (workingDirectory.empty()) {
+      // if user did not set a working directory manual, try the one in which the executable lives
+      directory = GetDirFromPathSlashes(path);
+  }
+  else {
+    directory = workingDirectory;
+  }
+
   if (directory.empty()) return ERROR_PATH_NOT_FOUND;
 
   VK_Environment environment;
diff --git a/Commons/Overlay/Overlay.h b/Commons/Overlay/Overlay.h
index fbf0fbe..5a06c0d 100644
--- a/Commons/Overlay/Overlay.h
+++ b/Commons/Overlay/Overlay.h
@@ -33,7 +33,8 @@ class Overlay {
 
   // Starts the given executable and suspends the process to load the overlay dll
   // if failed the process will be resumed without overlay
-  bool StartProcess(const std::wstring& path, std::wstring& cmdArgs, bool enableOverlay);
+  bool StartProcess(const std::wstring& path,
+                    const std::wstring& workingDirectory, std::wstring& cmdArgs, bool enableOverlay);
   void Stop();
 
   // returns the process name, empty if no process is attached
@@ -43,7 +44,9 @@ class Overlay {
 private:
   // Returns ERROR_SUCCES if a normal process was started, ERROR_APPCONTAINER_REQUIRED if tried to
   // start uwp app
-  DWORD CreateDesktopProcess(const std::wstring& path, std::wstring& cmdArgs, bool enableOverlay);
+ DWORD CreateDesktopProcess(const std::wstring& path,
+                            const std::wstring& workingDirectory, std::wstring& cmdArgs,
+                            bool enableOverlay);
   void SetProcessInfo(DWORD id);
 
   PROCESS_INFORMATION processInfo_{};
diff --git a/Commons/Overlay/OverlayInterface.cpp b/Commons/Overlay/OverlayInterface.cpp
index 2d6c093..8be1b89 100644
--- a/Commons/Overlay/OverlayInterface.cpp
+++ b/Commons/Overlay/OverlayInterface.cpp
@@ -57,12 +57,12 @@ bool OverlayInterface::Init(HWND hwnd)
   return true;
 }
 
-void OverlayInterface::StartProcess(const std::wstring& executable, std::wstring& cmdArgs)
+void OverlayInterface::StartProcess(const std::wstring& executable, const std::wstring& workingDirectory, std::wstring& cmdArgs)
 {
   g_messageLog.LogInfo("OverlayInterface", "Start single process");
   g_ProcessFinished = false;
   g_CaptureAll = false;
-  if (overlay_.StartProcess(executable, cmdArgs, true))
+  if (overlay_.StartProcess(executable, workingDirectory, cmdArgs, true))
   {
     processTermination_.Register(overlay_.GetProcessID());
   }
diff --git a/Commons/Overlay/OverlayInterface.h b/Commons/Overlay/OverlayInterface.h
index 9c39ea3..d2c3078 100644
--- a/Commons/Overlay/OverlayInterface.h
+++ b/Commons/Overlay/OverlayInterface.h
@@ -36,7 +36,7 @@ class OverlayInterface
 
   bool Init(HWND hwnd);
 
-  void StartProcess(const std::wstring& executable, std::wstring& cmdArgs);
+  void StartProcess(const std::wstring& executable, const std::wstring& workingDirectory, std::wstring& cmdArgs);
   void StartGlobal();
   void StopCapture(std::vector<int> overlayThreads);
   void FreeInjectedDlls(std::vector<int> injectedProcesses);
diff --git a/DLLInjector/DLLInjector.vcxproj b/DLLInjector/DLLInjector.vcxproj
index cd27611..773f6ab 100644
--- a/DLLInjector/DLLInjector.vcxproj
+++ b/DLLInjector/DLLInjector.vcxproj
@@ -22,34 +22,34 @@
     <ProjectGuid>{2CB4EFA8-1B5D-4BF8-AE28-8F42B99A740E}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>DLLInjector</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Frontend/Frontend.csproj b/Frontend/Frontend.csproj
index 28b46ef..c3935f3 100644
--- a/Frontend/Frontend.csproj
+++ b/Frontend/Frontend.csproj
@@ -60,12 +60,6 @@
     <ApplicationIcon>ocat.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft-WindowsAPICodePack-Core">
-      <Version>1.1.3.3</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft-WindowsAPICodePack-Shell">
-      <Version>1.1.3.3</Version>
-    </PackageReference>
     <PackageReference Include="OxyPlot.Core" Version="2.0.0-unstable1035" />
     <PackageReference Include="OxyPlot.Wpf" Version="2.0.0-unstable1035" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
@@ -187,6 +181,10 @@
   <PropertyGroup>
     <PostBuildEvent>xcopy /y /d "$(SolutionDir)$(Platform)\$(Configuration)\OxyPlot*.dll"  "$(SolutionDir)$(Platform)\$(Configuration)\Bin"
 xcopy /y /d "$(SolutionDir)$(Platform)\$(Configuration)\Microsoft.WindowsAPICodePack*.dll"  "$(SolutionDir)$(Platform)\$(Configuration)\Bin"</PostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent>xcopy /y /d  "$(VK_SDK_PATH)\share\vulkan\registry\vk.xml" "$(SolutionDir)\GameOverlay\vulkan\src"
+"python.exe" "$(SolutionDir)\GameOverlay\vulkan\src\gen_dispatch_table.py"</PreBuildEvent>
   </PropertyGroup>
   <Target AfterTargets="AfterBuild;NonWinFodyTarget" Name="CleanReferenceCopyLocalPaths">
     <Delete Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
diff --git a/Frontend/MainWindow.xaml b/Frontend/MainWindow.xaml
index ffadf45..273c203 100644
--- a/Frontend/MainWindow.xaml
+++ b/Frontend/MainWindow.xaml
@@ -545,6 +545,7 @@
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition/>
@@ -552,10 +553,13 @@
                     </Grid.ColumnDefinitions>
                     <TextBlock Margin="10,10,10,2" Grid.Row="0" x:Name="targetExeTextBlock" Style="{StaticResource Heading}" HorizontalAlignment="Left" Text="Target executable"/>
                     <TextBox Margin="10,2,10,5" Grid.Row="1" x:Name="targetExePath" Style="{StaticResource CustomTextBoxStyle}" HorizontalAlignment="Stretch" TextWrapping="Wrap" Background="DarkGray" Text="{Binding TargetExecutable, Mode=TwoWay}" HorizontalContentAlignment="Left"/>
-                    <TextBlock Margin="10,5,10,2" Grid.Row="2" x:Name="commandArgsTextBlock" Style="{StaticResource Heading}" TextWrapping="Wrap" Text="Commandline arguments"/>
-                    <TextBox Margin="10,2,10,10" Grid.Row="3" x:Name="commandArgsExePath" Style="{StaticResource CustomTextBoxStyle}" HorizontalAlignment="Stretch" TextWrapping="Wrap" Background="DarkGray" Text="" HorizontalContentAlignment="Left"/>
+                    <TextBlock Margin="10,5,10,2" Grid.Row="2" x:Name="workingDirectoryTextBlock" Style="{StaticResource Heading}" TextWrapping="Wrap" Text="Working directory"/>
+                    <TextBox Margin="10,2,10,5" Grid.Row="3" x:Name="workingDirectoryPath" Style="{StaticResource CustomTextBoxStyle}" HorizontalAlignment="Stretch" TextWrapping="Wrap" Background="DarkGray" Text="{Binding WorkingDirectory, Mode=TwoWay}" HorizontalContentAlignment="Left"/>
+                    <TextBlock Margin="10,5,10,2" Grid.Row="4" Grid.ColumnSpan="2" x:Name="commandArgsTextBlock" Style="{StaticResource Heading}" TextWrapping="Wrap" HorizontalAlignment="Left" Text="Commandline arguments" />
+                    <TextBox Margin="10,2,10,10" Grid.Row="5" Grid.ColumnSpan="2" x:Name="commandArgsExePath" Style="{StaticResource CustomTextBoxStyle}" HorizontalAlignment="Stretch" TextWrapping="Wrap" Background="DarkGray" Text="" HorizontalContentAlignment="Left"/>
                     <Button Grid.Column="1" Grid.RowSpan="2" Height="Auto" x:Name="targetExeButton" Style="{DynamicResource SimpleButton}" Click="TargetExeButton_Click" Background="LightGray">Select target executable</Button>
-                    <Button Grid.Column="1" Grid.Row="2" Grid.RowSpan="2" x:Name="startSingleApplicationButton" Style="{StaticResource StartSingleButtonStyle}" Content="Start application" Click="StartSingleApplicationButton_Click" IsEnabled="{Binding Path=IsReadyToRecord}" ToolTip="Start application with active overlay."/>
+                    <Button Grid.Column="1" Grid.Row="2" Grid.RowSpan="2" Height="Auto" x:Name="workingDirectoryButton" Style="{DynamicResource SimpleButton}" Click="workingDirectoryButton_Click" Background="LightGray">Select working directory</Button>
+                    <Button Grid.Column="1" Grid.Row="4" Grid.RowSpan="2" x:Name="startSingleApplicationButton" Style="{StaticResource StartSingleButtonStyle}" Content="Start application" Click="StartSingleApplicationButton_Click" IsEnabled="{Binding Path=IsReadyToRecord}" ToolTip="Start application with active overlay."/>
                 </Grid>
             </TabItem>
             <TabItem x:Name="visualizeTabItem" Header="Visualize" Style="{DynamicResource CustomTabItem}">
diff --git a/Frontend/MainWindow.xaml.cs b/Frontend/MainWindow.xaml.cs
index 71fa1fa..a405ef6 100644
--- a/Frontend/MainWindow.xaml.cs
+++ b/Frontend/MainWindow.xaml.cs
@@ -400,7 +400,7 @@ private void RecordingOutputFolderButton_Click(object sender, RoutedEventArgs e)
 
         private void TargetExeButton_Click(object sender, RoutedEventArgs e)
         {
-            OpenFileDialog fileDialog = new OpenFileDialog();
+            var fileDialog = new OpenFileDialog();
             fileDialog.Filter = "Executable|*.exe";
 
             bool? result = fileDialog.ShowDialog();
@@ -603,7 +603,7 @@ private void StartCapture(InjectionMode mode)
                 if (mode == InjectionMode.Single)
                 {
                     startSingleApplicationButton.Content = "Stop overlay";
-                    overlayTracker.StartCaptureExe(targetExePath.Text, commandArgsExePath.Text);
+                    overlayTracker.StartCaptureExe(targetExePath.Text, workingDirectoryPath.Text, commandArgsExePath.Text);
                     userInterfaceState.IsCapturingSingle = true;
                 }
                 else if (mode == InjectionMode.All)
@@ -746,5 +746,16 @@ private void CaptureKey(KeyCaptureMode mode, System.Windows.Controls.TextBlock t
             textBlock.Text = "Press new hotkey";
             keyCaptureMode = mode;
         }
+
+        private void workingDirectoryButton_Click(object sender, RoutedEventArgs e)
+        {
+            var folderDialog = new CommonOpenFileDialog();
+            folderDialog.IsFolderPicker = true;
+
+            if (folderDialog.ShowDialog() == CommonFileDialogResult.Ok)
+            {
+                userInterfaceState.WorkingDirectory = folderDialog.FileName;
+            }
+        }
     }
 }
diff --git a/Frontend/OverlayTracker.cs b/Frontend/OverlayTracker.cs
index 2c7f221..43b5334 100644
--- a/Frontend/OverlayTracker.cs
+++ b/Frontend/OverlayTracker.cs
@@ -217,7 +217,7 @@ public void FreeInjectedDlls()
             overlay.FreeInjectedDlls(processes);
         }
 
-        public void StartCaptureExe(string exe, string cmdArgs)
+        public void StartCaptureExe(string exe, string workingDirectory, string cmdArgs)
         {
             string[] args = cmdArgs.Split(' ');
             string steamRunAppId = "steam://run/";
@@ -249,7 +249,7 @@ public void StartCaptureExe(string exe, string cmdArgs)
                 }
             }
 
-            overlay.StartCaptureExe(exe, cmdArgs);
+            overlay.StartCaptureExe(exe, workingDirectory, cmdArgs);
         }
 
         public void StartCaptureAll()
diff --git a/Frontend/UserInterfaceState.cs b/Frontend/UserInterfaceState.cs
index de65343..4c4e453 100644
--- a/Frontend/UserInterfaceState.cs
+++ b/Frontend/UserInterfaceState.cs
@@ -39,6 +39,7 @@ public class UserInterfaceState : INotifyPropertyChanged
         private string captureOutputFolder;
         private string captureUserNote;
         private string targetExecutable;
+        private string workingDirectory;
         private string recordingState;
         private string csvFile;
         private string timePeriod;
@@ -179,6 +180,18 @@ public String TargetExecutable
             }
         }
 
+        public String WorkingDirectory
+        {
+            get { return workingDirectory; }
+            set
+            {
+                workingDirectory = value;
+                // if NULL or Empty choose as default working directory
+                // the directory where the target executable lives
+                this.NotifyPropertyChanged("WorkingDirectory");
+            }
+        }
+
         public String CsvFile
         {
             get { return csvFile; }
diff --git a/Frontend/packages.config b/Frontend/packages.config
index a1b08a5..76c44d2 100644
--- a/Frontend/packages.config
+++ b/Frontend/packages.config
@@ -14,7 +14,7 @@
   <package id="System.IO.Compression" version="4.3.0" targetFramework="net452" />
   <package id="System.Linq" version="4.3.0" targetFramework="net452" />
   <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net452" />
-  <package id="System.Net.Http" version="4.3.0" targetFramework="net452" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net452" />
   <package id="System.Net.Primitives" version="4.3.0" targetFramework="net452" />
   <package id="System.ObjectModel" version="4.3.0" targetFramework="net452" />
   <package id="System.Reflection" version="4.3.0" targetFramework="net452" />
@@ -28,7 +28,7 @@
   <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net452" />
   <package id="System.Text.Encoding" version="4.3.0" targetFramework="net452" />
   <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net452" />
-  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net452" />
+  <package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net452" />
   <package id="System.Threading" version="4.3.0" targetFramework="net452" />
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net452" />
   <package id="System.Threading.Timer" version="4.3.0" targetFramework="net452" />
diff --git a/GameOverlay/d3d/gameoverlay.vcxproj b/GameOverlay/d3d/gameoverlay.vcxproj
index 70cbfa2..bf1e340 100644
--- a/GameOverlay/d3d/gameoverlay.vcxproj
+++ b/GameOverlay/d3d/gameoverlay.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{73D3DECB-E915-4759-ABD0-FDAC8104B1CB}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
@@ -38,16 +38,16 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="PropertySheets">
@@ -79,7 +79,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)MinHook\include;$(SolutionDir)LibOVR\Include;$(ProjectDir)source;$(SolutionDir)openvr\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)MinHook\include;$(SolutionDir)VR\LibOVR\Include;$(ProjectDir)source;$(SolutionDir)VR\openvr\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -102,7 +102,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)MinHook\include;$(SolutionDir)LibOVR\Include;$(ProjectDir)source;$(SolutionDir)openvr\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)MinHook\include;$(SolutionDir)VR\LibOVR\Include;$(ProjectDir)source;$(SolutionDir)VR\openvr\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -127,7 +127,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)MinHook\include;$(SolutionDir)LibOVR\Include;$(ProjectDir)source;$(SolutionDir)openvr\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)MinHook\include;$(SolutionDir)VR\LibOVR\Include;$(ProjectDir)source;$(SolutionDir)VR\openvr\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
@@ -154,7 +154,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)MinHook\include;$(SolutionDir)LibOVR\Include;$(ProjectDir)source;$(SolutionDir)openvr\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)MinHook\include;$(SolutionDir)VR\LibOVR\Include;$(ProjectDir)source;$(SolutionDir)VR\openvr\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
diff --git a/GameOverlay/d3d/source/d3d/d3d12_renderer.cpp b/GameOverlay/d3d/source/d3d/d3d12_renderer.cpp
index b4ebcf9..bfc2eb6 100644
--- a/GameOverlay/d3d/source/d3d/d3d12_renderer.cpp
+++ b/GameOverlay/d3d/source/d3d/d3d12_renderer.cpp
@@ -142,12 +142,17 @@ bool d3d12_renderer::on_present(int backBufferIndex, bool lagIndicatorState)
   WaitForFence(frameFences_[backBufferIndex].Get(), frameFenceValues_[backBufferIndex],
                frameFenceEvents_[backBufferIndex]);
 
-  commandPool_->Reset();
+  HRESULT hr = commandPool_[backBufferIndex]->Reset();
+
+    if (FAILED(hr)) {
+    g_messageLog.LogError("D3D12", "on_present - Reset command allocator failed", hr);
+    return false;
+  }
 
   if (!overlayBitmap_->GetLagIndicatorVisibility())
   {
     overlayBitmap_->DrawOverlay();
-    UpdateOverlayTexture();
+    UpdateOverlayTexture(backBufferIndex);
   }
 
   DrawOverlay(backBufferIndex, lagIndicatorState);
@@ -182,17 +187,32 @@ void d3d12_renderer::UpdateOverlayPosition()
 
 bool d3d12_renderer::CreateCMDList()
 {
-  commandPool_.Reset();
-  commandList_.Reset();
+  HRESULT hr; 
+  
+  commandPool_.resize(bufferCount_);
+  for (int32_t i = 0; i < bufferCount_; i++)
+  {
+    hr = commandPool_[i].Reset();
+    if (FAILED(hr)) {
+      g_messageLog.LogError("CreateCMDList", "CommandAllocator reset failed", hr);
+      return false;
+    }
 
-  HRESULT hr;
-  hr = device_->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT, IID_PPV_ARGS(&commandPool_));
+    hr = device_->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT,
+                                         IID_PPV_ARGS(&commandPool_[i]));
+    if (FAILED(hr)) {
+      g_messageLog.LogError("D3D12", "CreateCommandAllocator failed", hr);
+      return false;
+    }
+  }
+
+  hr = commandList_.Reset();
   if (FAILED(hr)) {
-    g_messageLog.LogError("D3D12", "CreateCommandAllocator failed", hr);
+    g_messageLog.LogError("CreateCMDList", "CommandList reset failed", hr);
     return false;
   }
-
-  hr = device_->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_DIRECT, commandPool_.Get(), nullptr,
+  
+  hr = device_->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_DIRECT, commandPool_[0].Get(), nullptr,
                                   IID_PPV_ARGS(&commandList_));
   if (FAILED(hr)) {
     g_messageLog.LogError("D3D12", "CreateCommandList failed", hr);
@@ -394,9 +414,14 @@ bool d3d12_renderer::CreatePipelineStateObject()
 
 bool d3d12_renderer::CreateOverlayTextures()
 {
-  commandList_->Reset(commandPool_.Get(), nullptr);
+  HRESULT hr = commandList_->Reset(commandPool_[0].Get(), nullptr);
+
+  if (FAILED(hr)) {
+    g_messageLog.LogError("D3D12",
+                          "CreateOverlayTextures - Reset command list failed", hr);
+    return false;
+  }
 
-  HRESULT hr;
   const auto displayTextureWidth = overlayBitmap_->GetFullWidth();
   const auto displayTextureHeight = overlayBitmap_->GetFullHeight();
   // Create display texture
@@ -474,10 +499,13 @@ bool d3d12_renderer::CreateOverlayTextures()
 
 bool d3d12_renderer::CreateConstantBuffer()
 {
+  CD3DX12_HEAP_PROPERTIES uploadHeapProperties = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_UPLOAD);
+  CD3DX12_RESOURCE_DESC bufDesc = CD3DX12_RESOURCE_DESC::Buffer(sizeof(ConstantBuffer));
+
   viewportOffsetCB_.Reset();
   HRESULT hr = device_->CreateCommittedResource(
-    &CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_UPLOAD), D3D12_HEAP_FLAG_NONE,
-    &CD3DX12_RESOURCE_DESC::Buffer(sizeof(ConstantBuffer)), D3D12_RESOURCE_STATE_GENERIC_READ,
+    &uploadHeapProperties, D3D12_HEAP_FLAG_NONE,
+    &bufDesc, D3D12_RESOURCE_STATE_GENERIC_READ,
     nullptr, IID_PPV_ARGS(&viewportOffsetCB_));
 
   if (FAILED(hr)) {
@@ -485,10 +513,12 @@ bool d3d12_renderer::CreateConstantBuffer()
     return false;
   }
 
+  //&CD3DX12_RESOURCE_DESC::Buffer(sizeof(int) * 4)
+
   lagIndicatorKeyDownCB_.Reset();
   hr = device_->CreateCommittedResource(
-    &CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_UPLOAD), D3D12_HEAP_FLAG_NONE,
-    &CD3DX12_RESOURCE_DESC::Buffer(sizeof(int) * 4), D3D12_RESOURCE_STATE_GENERIC_READ,
+    &uploadHeapProperties, D3D12_HEAP_FLAG_NONE,
+    &bufDesc, D3D12_RESOURCE_STATE_GENERIC_READ,
     nullptr, IID_PPV_ARGS(&lagIndicatorKeyDownCB_));
 
   if (FAILED(hr)) {
@@ -513,7 +543,7 @@ void d3d12_renderer::UpdateConstantBuffer(const ConstantBuffer& constantBuffer)
   viewportOffsetCB_->Unmap(0, nullptr);
 }
 
-void d3d12_renderer::UpdateOverlayTexture()
+void d3d12_renderer::UpdateOverlayTexture(int backBufferIndex)
 {
   const auto textureData = overlayBitmap_->GetBitmapDataRead();
   if (textureData.dataPtr && textureData.size) {
@@ -527,7 +557,7 @@ void d3d12_renderer::UpdateOverlayTexture()
     memcpy(uploadDataPtr_, textureData.dataPtr, textureData.size);
     uploadBuffer_->Unmap(0, &readRange);
 
-    commandList_->Reset(commandPool_.Get(), nullptr);
+    hr = commandList_->Reset(commandPool_[backBufferIndex].Get(), nullptr);
     if (FAILED(hr)) {
       g_messageLog.LogError("D3D12", "UpdateOverlayTexture - Failed to reset command list.", hr);
       return;
@@ -571,7 +601,7 @@ void d3d12_renderer::UpdateOverlayTexture()
 
 void d3d12_renderer::DrawOverlay(int currentIndex, bool lagIndicatorState)
 {
-  HRESULT hr = commandList_->Reset(commandPool_.Get(), nullptr);
+  HRESULT hr = commandList_->Reset(commandPool_[currentIndex].Get(), nullptr);
   if (FAILED(hr)) {
     g_messageLog.LogError("D3D12", "DrawOverlay - Failed to reset command list.", hr);
     return;
@@ -674,7 +704,12 @@ void d3d12_renderer::WaitForCompletion()
 
   if (fence_->GetCompletedValue() < currFenceValue) {
     hr = fence_->SetEventOnCompletion(currFenceValue, fenceEvent_);
-    WaitForSingleObject(fenceEvent_, INFINITE);
+    DWORD returnCode = WaitForSingleObject(fenceEvent_, 100);
+    if (returnCode == WAIT_TIMEOUT) {
+      g_messageLog.LogError("D3D12", "WaitForCompletion - WaitForSingleObject timed out", hr);
+    }
   }
+
+  CloseHandle(fenceEvent_);
 }
 }  // namespace GameOverlay
diff --git a/GameOverlay/d3d/source/d3d/d3d12_renderer.hpp b/GameOverlay/d3d/source/d3d/d3d12_renderer.hpp
index ceb66b4..098451a 100644
--- a/GameOverlay/d3d/source/d3d/d3d12_renderer.hpp
+++ b/GameOverlay/d3d/source/d3d/d3d12_renderer.hpp
@@ -63,7 +63,7 @@ class d3d12_renderer
   bool CreateConstantBuffer();
   void UpdateConstantBuffer(const ConstantBuffer & constantBuffer);
 
-  void UpdateOverlayTexture();
+  void UpdateOverlayTexture(int backBufferIndex);
   void UpdateOverlayPosition();
   void DrawOverlay(int currentIndex, bool lagIndicatorState);
 
@@ -74,7 +74,7 @@ class d3d12_renderer
   Microsoft::WRL::ComPtr<ID3D12CommandQueue> queue_;
   Microsoft::WRL::ComPtr<IDXGISwapChain3> swapchain_;
 
-  Microsoft::WRL::ComPtr<ID3D12CommandAllocator> commandPool_;
+  std::vector<Microsoft::WRL::ComPtr<ID3D12CommandAllocator>> commandPool_;
   Microsoft::WRL::ComPtr<ID3D12GraphicsCommandList> commandList_;
 
   Microsoft::WRL::ComPtr<ID3D12RootSignature> rootSignature_;
diff --git a/GameOverlay/d3d/source/d3d/dxgi.cpp b/GameOverlay/d3d/source/d3d/dxgi.cpp
index 4e3f9bb..7e0d3fb 100644
--- a/GameOverlay/d3d/source/d3d/dxgi.cpp
+++ b/GameOverlay/d3d/source/d3d/dxgi.cpp
@@ -36,45 +36,6 @@ using namespace Microsoft::WRL;
 
 #define WRAP_DXGI 0
 
-template <typename T>
-void hook_factory_object(T **factoryTarget)
-{
-  IDXGIFactory *const factory = static_cast<IDXGIFactory *>(*factoryTarget);
-  // Only install hooks for IDXGIFactory because the same function is called for IDXGIFactory1 and IDXGIFactory2
-  if (GameOverlay::install_hook(VTABLE(factory), 10, reinterpret_cast<GameOverlay::hook::address>(
-    &IDXGIFactory_CreateSwapChain)))
-  {
-    g_messageLog.LogInfo("dxgi", "Successfully installed hook for CreateSwapChain.");
-  }
-
-  // IDXGIFactory2
-  ComPtr<IDXGIFactory2> factory2;
-  if (SUCCEEDED(factory->QueryInterface(factory2.GetAddressOf()))) 
-  {
-    if (GameOverlay::install_hook(VTABLE(factory2.Get()), 15, reinterpret_cast<GameOverlay::hook::address>(
-      &IDXGIFactory2_CreateSwapChainForHwnd)))
-    {
-      g_messageLog.LogInfo("dxgi", "Successfully installed hook for CreateSwapChainForHwnd.");
-    }
-
-    if (GameOverlay::install_hook(VTABLE(factory2.Get()), 16, reinterpret_cast<GameOverlay::hook::address>(
-      &IDXGIFactory2_CreateSwapChainForCoreWindow)))
-    {
-      g_messageLog.LogInfo("dxgi", "Successfully installed hook for CreateSwapChainForCoreWindow.");
-    }
-
-    if (GameOverlay::install_hook(VTABLE(factory2.Get()), 24, reinterpret_cast<GameOverlay::hook::address>(
-      &IDXGIFactory2_CreateSwapChainForComposition)))
-    {
-      g_messageLog.LogInfo("dxgi", "Successfully installed hook for CreateSwapChainForComposition.");
-    }
-  }
-  else 
-  {
-    g_messageLog.LogError("dxgi", "Query interface for IDXGIFactory2 failed.");
-  }
-}
-
 template <typename T>
 void hook_swapchain_object(IUnknown *device, T **swapchainTarget)
 { 
@@ -242,6 +203,45 @@ HRESULT STDMETHODCALLTYPE IDXGIFactory2_CreateSwapChainForComposition(
   return hr;
 }
 
+template <typename T>
+void hook_factory_object(T **factoryTarget)
+{
+  IDXGIFactory *const factory = static_cast<IDXGIFactory *>(*factoryTarget);
+  // Only install hooks for IDXGIFactory because the same function is called for IDXGIFactory1 and
+  // IDXGIFactory2
+  if (GameOverlay::install_hook(
+          VTABLE(factory), 10,
+          reinterpret_cast<GameOverlay::hook::address>(&IDXGIFactory_CreateSwapChain))) {
+    g_messageLog.LogInfo("dxgi", "Successfully installed hook for CreateSwapChain.");
+  }
+
+  // IDXGIFactory2
+  ComPtr<IDXGIFactory2> factory2;
+  if (SUCCEEDED(factory->QueryInterface(factory2.GetAddressOf()))) {
+    if (GameOverlay::install_hook(
+            VTABLE(factory2.Get()), 15,
+            reinterpret_cast<GameOverlay::hook::address>(&IDXGIFactory2_CreateSwapChainForHwnd))) {
+      g_messageLog.LogInfo("dxgi", "Successfully installed hook for CreateSwapChainForHwnd.");
+    }
+
+    if (GameOverlay::install_hook(VTABLE(factory2.Get()), 16,
+                                  reinterpret_cast<GameOverlay::hook::address>(
+                                      &IDXGIFactory2_CreateSwapChainForCoreWindow))) {
+      g_messageLog.LogInfo("dxgi", "Successfully installed hook for CreateSwapChainForCoreWindow.");
+    }
+
+    if (GameOverlay::install_hook(VTABLE(factory2.Get()), 24,
+                                  reinterpret_cast<GameOverlay::hook::address>(
+                                      &IDXGIFactory2_CreateSwapChainForComposition))) {
+      g_messageLog.LogInfo("dxgi",
+                           "Successfully installed hook for CreateSwapChainForComposition.");
+    }
+  }
+  else {
+    g_messageLog.LogError("dxgi", "Query interface for IDXGIFactory2 failed.");
+  }
+}
+
 EXTERN_C HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **ppFactory)
 {
   g_messageLog.LogInfo("dxgi", "CreateDXGIFactory");
diff --git a/GameOverlay/d3d/source/d3d/dxgi_swapchain.cpp b/GameOverlay/d3d/source/d3d/dxgi_swapchain.cpp
index 041265a..336d641 100644
--- a/GameOverlay/d3d/source/d3d/dxgi_swapchain.cpp
+++ b/GameOverlay/d3d/source/d3d/dxgi_swapchain.cpp
@@ -68,149 +68,155 @@ DXGISwapChain::DXGISwapChain(ID3D12CommandQueue *commandQueue, IDXGISwapChain *s
 // IUnknown
 HRESULT STDMETHODCALLTYPE DXGISwapChain::QueryInterface(REFIID riid, void **ppvObj)
 {
-  g_messageLog.LogVerbose("QueryInterface", "Entered function");
+  g_messageLog.LogInfo("QueryInterface", "Entered function");
   if (ppvObj == nullptr) {
-    g_messageLog.LogVerbose("QueryInterface", "Invalid pointer");
+    g_messageLog.LogInfo("QueryInterface", "Invalid pointer");
     return E_POINTER;
   }
 
   bool swapChainUpdated = false;
-#pragma region Update to IDXGISwapChain interface
-  if (riid == __uuidof(IDXGISwapChain)) {
-  if (swapChainVersion_ > SWAPCHAIN_0) {
-    g_messageLog.LogWarning("DXGISwapChain", 
-      "QueryInterface IDXGISwapChain with higher swapChainVersion");
-  }
-  IDXGISwapChain1 *swapchain = nullptr;
 
-    HRESULT hr = swapChain_->QueryInterface(&swapchain);
-    if (FAILED(hr)) {
-      g_messageLog.LogError("DXGISwapChain",
-        "QueryInterface IDXGISwapChain failed", hr);
-      return E_NOINTERFACE;
+  // we just hook the first query up, to prevent messing with references
+  // forward all subsequent queries
+  if (!interfaceQueried_) {
+#pragma region Update to IDXGISwapChain interface
+    if (riid == __uuidof(IDXGISwapChain)) {
+      if (swapChainVersion_ > SWAPCHAIN_0) {
+        g_messageLog.LogWarning("DXGISwapChain",
+                                "QueryInterface IDXGISwapChain with higher swapChainVersion");
+      }
+      IDXGISwapChain1 *swapchain = nullptr;
+
+      HRESULT hr = swapChain_->QueryInterface(&swapchain);
+      if (FAILED(hr)) {
+        g_messageLog.LogError("DXGISwapChain", "QueryInterface IDXGISwapChain failed", hr);
+        return E_NOINTERFACE;
+      }
+
+      swapChain_->Release();
+      
+      swapChain_ = swapchain;
+      swapChainVersion_ = SWAPCHAIN_0;
+      swapChainUpdated = true;
+      g_messageLog.LogInfo("QueryInterface", "Swap chain created");
     }
-
-    swapChain_->Release();
-
-    swapChain_ = swapchain;
-    swapChainVersion_ = SWAPCHAIN_0;
-    swapChainUpdated = true;
-    g_messageLog.LogVerbose("QueryInterface", "Swap chain created");
-  }
 #pragma endregion
 #pragma region Update to IDXGISwapChain1 interface
-  if (riid == __uuidof(IDXGISwapChain1)) {
-  if (swapChainVersion_ > SWAPCHAIN_1) {
-    g_messageLog.LogWarning("DXGISwapChain",
-      "QueryInterface IDXGISwapChain1 with higher swapChainVersion");
-  }
-  IDXGISwapChain1 *swapchain1 = nullptr;
-
-    HRESULT hr = swapChain_->QueryInterface(&swapchain1);
-    if (FAILED(hr)) {
-      g_messageLog.LogError("DXGISwapChain",
-                       "QueryInterface IDXGISwapChain1 failed", hr);
-      return E_NOINTERFACE;
+    if (riid == __uuidof(IDXGISwapChain1)) {
+      if (swapChainVersion_ > SWAPCHAIN_1) {
+        g_messageLog.LogWarning("DXGISwapChain",
+                                "QueryInterface IDXGISwapChain1 with higher swapChainVersion");
+      }
+      IDXGISwapChain1 *swapchain1 = nullptr;
+
+      HRESULT hr = swapChain_->QueryInterface(&swapchain1);
+      if (FAILED(hr)) {
+        g_messageLog.LogError("DXGISwapChain", "QueryInterface IDXGISwapChain1 failed", hr);
+        return E_NOINTERFACE;
+      }
+
+      swapChain_->Release();
+
+      swapChain_ = swapchain1;
+      swapChainVersion_ = SWAPCHAIN_1;
+      swapChainUpdated = true;
+      g_messageLog.LogInfo("QueryInterface", "Swap chain 1 created");
     }
-
-    swapChain_->Release();
-
-    swapChain_ = swapchain1;
-    swapChainVersion_ = SWAPCHAIN_1;
-    swapChainUpdated = true;
-    g_messageLog.LogVerbose("QueryInterface", "Swap chain 1 created");
-  }
 #pragma endregion
 #pragma region Update to IDXGISwapChain2 interface
-  if (riid == __uuidof(IDXGISwapChain2)) {
-  if (swapChainVersion_ > SWAPCHAIN_2) {
-    g_messageLog.LogWarning("DXGISwapChain",
-      "QueryInterface IDXGISwapChain2 with higher swapChainVersion");
-  }
-  IDXGISwapChain2 *swapchain2 = nullptr;
-
-    HRESULT hr = swapChain_->QueryInterface(&swapchain2);
-    if (FAILED(hr)) {
-      g_messageLog.LogError("DXGISwapChain",
-                       "QueryInterface IDXGISwapChain2 failed", hr);
-      return E_NOINTERFACE;
+    if (riid == __uuidof(IDXGISwapChain2)) {
+      if (swapChainVersion_ > SWAPCHAIN_2) {
+        g_messageLog.LogWarning("DXGISwapChain",
+                                "QueryInterface IDXGISwapChain2 with higher swapChainVersion");
+      }
+      IDXGISwapChain2 *swapchain2 = nullptr;
+
+      HRESULT hr = swapChain_->QueryInterface(&swapchain2);
+      if (FAILED(hr)) {
+        g_messageLog.LogError("DXGISwapChain", "QueryInterface IDXGISwapChain2 failed", hr);
+        return E_NOINTERFACE;
+      }
+
+      swapChain_->Release();
+
+      swapChain_ = swapchain2;
+      swapChainVersion_ = SWAPCHAIN_2;
+      swapChainUpdated = true;
+      g_messageLog.LogInfo("QueryInterface", "Swap chain 2 created");
     }
-
-    swapChain_->Release();
-
-    swapChain_ = swapchain2;
-    swapChainVersion_ = SWAPCHAIN_2;
-    swapChainUpdated = true;
-    g_messageLog.LogVerbose("QueryInterface", "Swap chain 2 created");
-  }
 #pragma endregion
-#pragma region Update to IDXGISwapChain3 interface
-  if (riid == __uuidof(IDXGISwapChain3)) {
-  if (swapChainVersion_ > SWAPCHAIN_3) {
-    g_messageLog.LogWarning("DXGISwapChain",
-      "QueryInterface IDXGISwapChain3 with higher swapChainVersion");
-  }
-  IDXGISwapChain3 *swapchain3 = nullptr;
 
-    HRESULT hr = swapChain_->QueryInterface(&swapchain3);
-    if (FAILED(hr)) {
-      g_messageLog.LogError("DXGISwapChain",
-                       "QueryInterface IDXGISwapChain3 failed", hr);
-      return E_NOINTERFACE;
+#pragma region Update to IDXGISwapChain3 interface
+    if (riid == __uuidof(IDXGISwapChain3)) {
+      if (swapChainVersion_ > SWAPCHAIN_3) {
+        g_messageLog.LogWarning("DXGISwapChain",
+                                "QueryInterface IDXGISwapChain3 with higher swapChainVersion");
+      }
+      IDXGISwapChain3 *swapchain3 = nullptr;
+
+      HRESULT hr = swapChain_->QueryInterface(&swapchain3);
+      if (FAILED(hr)) {
+        g_messageLog.LogError("DXGISwapChain", "QueryInterface IDXGISwapChain3 failed", hr);
+        return E_NOINTERFACE;
+      }
+
+      swapChain_->Release();
+
+      swapChain_ = swapchain3;
+      swapChainVersion_ = SWAPCHAIN_3;
+      swapChainUpdated = true;
+      g_messageLog.LogInfo("QueryInterface", "Swap chain 3 created");
     }
-
-    swapChain_->Release();
-
-    swapChain_ = swapchain3;
-    swapChainVersion_ = SWAPCHAIN_3;
-    swapChainUpdated = true;
-    g_messageLog.LogVerbose("QueryInterface", "Swap chain 3 created");
-  }
 #pragma endregion
-#pragma region Update to IDXGISwapChain4 interface
-  if (riid == __uuidof(IDXGISwapChain4)) {
-  if (swapChainVersion_ > SWAPCHAIN_4) {
-    g_messageLog.LogWarning("DXGISwapChain",
-      "QueryInterface IDXGISwapChain4 with higher swapChainVersion");
-  }
-  IDXGISwapChain4 *swapchain4 = nullptr;
 
-    HRESULT hr = swapChain_->QueryInterface(&swapchain4);
-    if (FAILED(hr)) {
-      g_messageLog.LogError("DXGISwapChain",
-                       "QueryInterface IDXGISwapChain4 failed", hr);
-      return E_NOINTERFACE;
+#pragma region Update to IDXGISwapChain4 interface
+    if (riid == __uuidof(IDXGISwapChain4)) {
+      if (swapChainVersion_ > SWAPCHAIN_4) {
+        g_messageLog.LogWarning("DXGISwapChain",
+                                "QueryInterface IDXGISwapChain4 with higher swapChainVersion");
+      }
+      IDXGISwapChain4 *swapchain4 = nullptr;
+
+      HRESULT hr = swapChain_->QueryInterface(&swapchain4);
+      if (FAILED(hr)) {
+        g_messageLog.LogError("DXGISwapChain", "QueryInterface IDXGISwapChain4 failed", hr);
+        return E_NOINTERFACE;
+      }
+
+      swapChain_->Release();
+
+      swapChain_ = swapchain4;
+      swapChainVersion_ = SWAPCHAIN_4;
+      swapChainUpdated = true;
+      g_messageLog.LogInfo("QueryInterface", "Swap chain 4 created");
     }
-
-    swapChain_->Release();
-
-    swapChain_ = swapchain4;
-    swapChainVersion_ = SWAPCHAIN_4;
-    swapChainUpdated = true;
-    g_messageLog.LogVerbose("QueryInterface", "Swap chain 4 created");
-  }
 #pragma endregion
+  }
 
   if (swapChainUpdated || g_uwpApp) {
+    interfaceQueried_ = true;
     AddRef();
     *ppvObj = this;
-    g_messageLog.LogVerbose("QueryInterface", "Return this");
+    g_messageLog.LogInfo("QueryInterface", "Return this");
     return S_OK;
   }
   else {
-    g_messageLog.LogVerbose("QueryInterface", "Forward query interface");
-    return swapChain_->QueryInterface(riid, ppvObj);
+    g_messageLog.LogInfo("QueryInterface", "Forward query interface");
+
+    HRESULT hr = swapChain_->QueryInterface(riid, ppvObj);
+    return hr;
   }
 }
 
 ULONG STDMETHODCALLTYPE DXGISwapChain::AddRef()
 {
+  g_messageLog.LogInfo("DXGISwapChain", "AddRef");
   return swapChain_->AddRef();
 }
 
 ULONG STDMETHODCALLTYPE DXGISwapChain::Release()
 {
-  ULONG ref = swapChain_->Release();
+  g_messageLog.LogInfo("DXGISwapChain", "Release");
 
   switch (d3dVersion_) {
     case D3DVersion_11:
@@ -226,9 +232,7 @@ ULONG STDMETHODCALLTYPE DXGISwapChain::Release()
   g_SteamVRD3D.reset();
   g_OculusD3D.reset();
 
-  if (ref == 1) {
-    delete this;
-  }
+  ULONG ref = swapChain_->Release();
 
   return ref;
 }
diff --git a/GameOverlay/d3d/source/d3d/dxgi_swapchain.hpp b/GameOverlay/d3d/source/d3d/dxgi_swapchain.hpp
index 2d4c739..0b82e6d 100644
--- a/GameOverlay/d3d/source/d3d/dxgi_swapchain.hpp
+++ b/GameOverlay/d3d/source/d3d/dxgi_swapchain.hpp
@@ -133,4 +133,6 @@ struct DXGISwapChain : IDXGISwapChain4 {
 
   bool lagIndicatorState_ = false;
   std::mutex mutex_;
+
+  bool interfaceQueried_ = false;
 };
diff --git a/GameOverlay/d3d/source/hook_manager.cpp b/GameOverlay/d3d/source/hook_manager.cpp
index e3b08a6..6e4bab1 100644
--- a/GameOverlay/d3d/source/hook_manager.cpp
+++ b/GameOverlay/d3d/source/hook_manager.cpp
@@ -32,7 +32,7 @@
 #include <vector>
 #include "Overlay/DLLInjection.h"
 #include "Overlay/VK_Environment.h"
-#include "Config/BlackList.h"
+#include "Config/DenyList.h"
 #include "Recording/Capturing.h"
 #include "Utility/FileDirectory.h"
 #include "Logging/MessageLog.h"
@@ -41,7 +41,7 @@
 #include "Utility/SmartHandle.h"
 
 extern std::wstring g_dllDirectory;
-extern BlackList g_blackList;
+extern DenyList g_denyList;
 
 std::vector<std::wstring> g_filter;
 
@@ -473,8 +473,8 @@ namespace GameOverlay {
 
     void EnableVulkan(VK_Environment& vkEnv, const std::wstring& processName)
     {
-      const auto blacklisted = g_blackList.Contains(processName);
-      if (!blacklisted) {
+      const auto denied = g_denyList.Contains(processName);
+      if (!denied) {
         vkEnv.SetVKEnvironment(g_dllDirectory);
       }
     }
@@ -603,7 +603,7 @@ namespace GameOverlay {
       L"crypt32", L"msvcp_win", L"win32u", L"user32", L"combase", L"ole32",
       L"setupapi", L"winhttp", L"aticfx64", L"atiuxp64", L"atidxx64", L"amdihk64",
       L"rpcrt", L"vcruntime", L"psapi",L"bcrypt", L"cryptsp", L"shcore",
-      L"overlay", L"language.dll" };
+      L"overlay", L"language.dll", L"VkLayer"};
 
     for (auto& entry : filter)
     {
@@ -891,7 +891,7 @@ namespace GameOverlay {
     else {
       s_delayed_hook_paths.push_back(target_path);
     }
-
+    
     return numModulesRegistered > 0;
   }
 
diff --git a/GameOverlay/d3d/source/main.cpp b/GameOverlay/d3d/source/main.cpp
index 0514262..34da5a5 100644
--- a/GameOverlay/d3d/source/main.cpp
+++ b/GameOverlay/d3d/source/main.cpp
@@ -25,7 +25,7 @@
 
 #include <windows.h>
 #include <appmodel.h>
-#include "Config/BlackList.h"
+#include "Config/DenyList.h"
 #include "Recording/Capturing.h"
 #include "Utility/Constants.h"
 #include "Utility/FileDirectory.h"
@@ -47,7 +47,7 @@ HWND sharedFrontendWindow = NULL;
 HMODULE g_module_handle = NULL;
 HHOOK g_hook = NULL;
 std::wstring g_dllDirectory;
-BlackList g_blackList;
+DenyList g_denyList;
 bool g_uwpApp = false;
 
 extern "C" __declspec(dllexport) LRESULT CALLBACK
@@ -128,13 +128,13 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID lpReserved)
     GetSystemDirectoryW(system_path_buffer, MAX_PATH);
     const std::wstring system_path(system_path_buffer);
 
-    g_blackList.Load();
+    g_denyList.Load();
     const std::wstring processName = GetProcessNameFromHandle(GetCurrentProcess());
     if (!processName.empty())
     {
-      if (!g_blackList.Contains(processName))
+      if (!g_denyList.Contains(processName))
       {
-        g_messageLog.SetVersion(g_blackList.GetVersion());
+        g_messageLog.SetVersion(g_denyList.GetVersion());
         InitLogging();
         SendDllStateMessage(OverlayMessageType::AttachDll);
 
@@ -167,7 +167,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID lpReserved)
       }
       else
       {
-        g_messageLog.LogInfo("GameOverlay", L"Process '" + processName + L"' is on blacklist -> Ignore");
+        g_messageLog.LogInfo("GameOverlay", L"Process '" + processName + L"' is on denylist -> Ignore");
       }
       
     }
diff --git a/GameOverlay/vulkan/VK_LAYER_OCAT_overlay.def b/GameOverlay/vulkan/VK_LAYER_OCAT_overlay.def
index 95c714d..42eaa21 100644
--- a/GameOverlay/vulkan/VK_LAYER_OCAT_overlay.def
+++ b/GameOverlay/vulkan/VK_LAYER_OCAT_overlay.def
@@ -2,9 +2,9 @@ EXPORTS
 	; vulkan-1.dll
 	vkGetInstanceProcAddr
 	vkGetDeviceProcAddr
-	vkEnumerateInstanceLayerProperties
+	; vkEnumerateInstanceLayerProperties
 	vkEnumerateDeviceLayerProperties
-	vkEnumerateInstanceExtensionProperties
+	; vkEnumerateInstanceExtensionProperties
 	vkEnumerateDeviceExtensionProperties
 	vkCreateInstance
 	vkDestroyInstance
diff --git a/GameOverlay/vulkan/VK_LAYER_OCAT_overlay.vcxproj b/GameOverlay/vulkan/VK_LAYER_OCAT_overlay.vcxproj
index 6133f7d..ffcf685 100644
--- a/GameOverlay/vulkan/VK_LAYER_OCAT_overlay.vcxproj
+++ b/GameOverlay/vulkan/VK_LAYER_OCAT_overlay.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{5DCD1605-F3A1-418E-B1E9-3C5382D948C8}</ProjectGuid>
     <RootNamespace>VK_LAYER_AMD_overlay</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <ProjectName>VK_LAYER_OCAT_overlay</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -29,27 +29,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -94,7 +94,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(VK_SDK_PATH)\include;$(VK_SDK_PATH)\LayerFactory\Project;$(ProjectDir);$(SolutionDir)GameOverlay\d3d\source;$(SolutionDir)LibOVR\Include;$(SolutionDir)openvr\headers</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(VK_SDK_PATH)\include;$(ProjectDir);$(SolutionDir)GameOverlay\d3d\source;$(SolutionDir)VR\LibOVR\Include;$(SolutionDir)VR\openvr\headers</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;API_NAME="Vulkan";%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -118,7 +118,7 @@ xcopy /Y /D src\*spv "$(OutDir)"</Command>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(VK_SDK_PATH)\include;$(VK_SDK_PATH)\LayerFactory\Project;$(ProjectDir);$(SolutionDir)GameOverlay\d3d\source;$(SolutionDir)LibOVR\Include;$(SolutionDir)openvr\headers</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(VK_SDK_PATH)\include;$(ProjectDir);$(SolutionDir)GameOverlay\d3d\source;$(SolutionDir)VR\LibOVR\Include;$(SolutionDir)VR\openvr\headers</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;API_NAME="Vulkan";%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -144,7 +144,7 @@ xcopy /Y /D src\*spv "$(OutDir)"</Command>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(VK_SDK_PATH)\include;$(VK_SDK_PATH)\LayerFactory\Project;$(ProjectDir);$(SolutionDir)GameOverlay\d3d\source;$(SolutionDir)LibOVR\Include;$(SolutionDir)openvr\headers</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(VK_SDK_PATH)\include;$(ProjectDir);$(SolutionDir)GameOverlay\d3d\source;$(SolutionDir)VR\LibOVR\Include;$(SolutionDir)VR\openvr\headers</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;API_NAME="Vulkan";%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -171,7 +171,7 @@ xcopy /Y /D src\*spv "$(OutDir)"</Command>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(VK_SDK_PATH)\include;$(VK_SDK_PATH)\LayerFactory\Project;$(ProjectDir);$(SolutionDir)GameOverlay\d3d\source;$(SolutionDir)LibOVR\Include;$(SolutionDir)openvr\headers</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(VK_SDK_PATH)\include;$(ProjectDir);$(SolutionDir)GameOverlay\d3d\source;$(SolutionDir)VR\LibOVR\Include;$(SolutionDir)VR\openvr\headers</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;API_NAME="Vulkan";%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
diff --git a/GameOverlay/vulkan/src/AppResMapping.cpp b/GameOverlay/vulkan/src/AppResMapping.cpp
index 999047b..6ee1c70 100644
--- a/GameOverlay/vulkan/src/AppResMapping.cpp
+++ b/GameOverlay/vulkan/src/AppResMapping.cpp
@@ -39,8 +39,7 @@ void AppResMapping::DestroyInstance(VkInstance instance)
       });
 }
 
-void AppResMapping::EnumeratePhysicalDevices(VkInstance instance,
-                                             VkLayerInstanceDispatchTable* pTable,
+void AppResMapping::EnumeratePhysicalDevices(VkInstance instance, VkInstDispatchTable* pTable,
                                              uint32_t* pPhysicalDeviceCount,
                                              VkPhysicalDevice* pPhysicalDevices)
 {
diff --git a/GameOverlay/vulkan/src/AppResMapping.h b/GameOverlay/vulkan/src/AppResMapping.h
index c4a9754..6651087 100644
--- a/GameOverlay/vulkan/src/AppResMapping.h
+++ b/GameOverlay/vulkan/src/AppResMapping.h
@@ -24,7 +24,9 @@
 
 #define VK_USE_PLATFORM_WIN32_KHR
 #include <assert.h>
-#include <vk_dispatch_table_helper.h>
+
+#include "vk_dispatch_defs.h"
+
 #include <vulkan/vulkan.h>
 
 #include "HashMap.h"
@@ -35,7 +37,7 @@ class AppResMapping {
   void CreateInstance(VkInstance instance, const VkInstanceCreateInfo* pCreateInfo);
   void DestroyInstance(VkInstance instance);
 
-  void EnumeratePhysicalDevices(VkInstance instance, VkLayerInstanceDispatchTable* pTable,
+  void EnumeratePhysicalDevices(VkInstance instance, VkInstDispatchTable* pTable,
                                 uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices);
   void CreateDevice(VkDevice device, VkPhysicalDevice physicalDevice,
                     const VkDeviceCreateInfo* pCreateInfo);
diff --git a/GameOverlay/vulkan/src/Compositor/vk_oculus.cpp b/GameOverlay/vulkan/src/Compositor/vk_oculus.cpp
index 1db0e21..5fbe77a 100644
--- a/GameOverlay/vulkan/src/Compositor/vk_oculus.cpp
+++ b/GameOverlay/vulkan/src/Compositor/vk_oculus.cpp
@@ -136,7 +136,7 @@ ovrRecti Oculus_Vk::GetViewport()
   return viewport;
 }
 
-bool Oculus_Vk::Init(VkLayerDispatchTable* pTable,
+bool Oculus_Vk::Init(VkDevDispatchTable* pTable,
   const VkPhysicalDeviceMemoryProperties& physicalDeviceMemoryProperties, ovrSession& session)
 {
   if (initialized_)
@@ -176,7 +176,7 @@ bool Oculus_Vk::Init(VkLayerDispatchTable* pTable,
   return initialized_;
 }
 
-bool Oculus_Vk::Render(VkLayerDispatchTable* pTable,
+bool Oculus_Vk::Render(VkDevDispatchTable* pTable,
   PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr,
   uint32_t queueFamilyIndex, VkQueueFlags queueFlags, ovrSession& session)
 {
@@ -192,7 +192,8 @@ bool Oculus_Vk::Render(VkLayerDispatchTable* pTable,
   GameOverlay::find_hook_trampoline(&ovr_GetTextureSwapChainCurrentIndex)(
     session, swapchain_, &imageIndex);
 
-  VkSemaphore semaphore = renderer_->OnSubmitFrameCompositor(pTable, setDeviceLoaderDataFuncPtr, queue_, 
+  VkSemaphore semaphore = renderer_->OnSubmitFrameCompositor(pTable, 
+      setDeviceLoaderDataFuncPtr, queue_, 
     queueFamilyIndex, queueFlags, imageIndex);
 
   GameOverlay::find_hook_trampoline(&ovr_CommitTextureSwapChain)(session,
@@ -201,7 +202,7 @@ bool Oculus_Vk::Render(VkLayerDispatchTable* pTable,
   return (semaphore != VK_NULL_HANDLE);
 }
 
-void Oculus_Vk::DestroyRenderer(VkDevice device, VkLayerDispatchTable* pTable)
+void Oculus_Vk::DestroyRenderer(VkDevice device, VkDevDispatchTable* pTable)
 {
   if (device == device_ && renderer_)
     renderer_->OnDestroyCompositor(pTable);
diff --git a/GameOverlay/vulkan/src/Compositor/vk_oculus.h b/GameOverlay/vulkan/src/Compositor/vk_oculus.h
index fd2d7d3..1c67aa6 100644
--- a/GameOverlay/vulkan/src/Compositor/vk_oculus.h
+++ b/GameOverlay/vulkan/src/Compositor/vk_oculus.h
@@ -64,14 +64,14 @@ class Oculus_Vk {
   VkDevice GetDevice() { return device_; }
   ovrTextureSwapChain GetSwapChain() { return swapchain_; }
 
-  bool Init(VkLayerDispatchTable* pTable,
+  bool Init(VkDevDispatchTable* pTable,
     const VkPhysicalDeviceMemoryProperties& physicalDeviceMemoryProperties,
     ovrSession& session);
-  bool Render(VkLayerDispatchTable* pTable,
+  bool Render(VkDevDispatchTable* pTable,
     PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr,
     uint32_t queueFamilyIndex, VkQueueFlags queueFlags, ovrSession& session);
 
-  void DestroyRenderer(VkDevice device, VkLayerDispatchTable* pTable);
+  void DestroyRenderer(VkDevice device, VkDevDispatchTable* pTable);
 
   ovrRecti GetViewport();
 
diff --git a/GameOverlay/vulkan/src/Compositor/vk_steamvr.cpp b/GameOverlay/vulkan/src/Compositor/vk_steamvr.cpp
index 3c838ad..abc0aa9 100644
--- a/GameOverlay/vulkan/src/Compositor/vk_steamvr.cpp
+++ b/GameOverlay/vulkan/src/Compositor/vk_steamvr.cpp
@@ -39,7 +39,7 @@ void SteamVR_Vk::SetDevice(VkDevice device)
   device_ = device;
 }
 
-void SteamVR_Vk::Init(VkLayerDispatchTable* pTable,
+void SteamVR_Vk::Init(VkDevDispatchTable* pTable,
   const VkPhysicalDeviceMemoryProperties& physicalDeviceMemoryProperties,
   VkFormat format, VkImageUsageFlags usage)
 {
@@ -77,12 +77,13 @@ void SteamVR_Vk::Init(VkLayerDispatchTable* pTable,
   overlay_->SetOverlayTransformAbsolute(overlayHandle_, trackingOrigin, &hmd);
 }
 
-void SteamVR_Vk::Render(const vr::Texture_t *pTexture,
-  VkLayerDispatchTable* pTable,
+void SteamVR_Vk::Render(const vr::Texture_t* pTexture, VkDevDispatchTable* pTable,
   PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr,
   VkQueue queue, uint32_t queueFamilyIndex, VkQueueFlags queueFlags) 
 {
-  renderer_->OnSubmitFrameCompositor(pTable, setDeviceLoaderDataFuncPtr, queue, queueFamilyIndex,
+  renderer_->OnSubmitFrameCompositor(pTable, 
+      setDeviceLoaderDataFuncPtr, 
+      queue, queueFamilyIndex,
     queueFlags, currentIndex_);
 
   vr::Texture_t overlayTexture = *pTexture;
@@ -99,7 +100,7 @@ void SteamVR_Vk::Render(const vr::Texture_t *pTexture,
   currentIndex_ ^= 1;
 }
 
-void SteamVR_Vk::DestroyRenderer(VkDevice device, VkLayerDispatchTable* pTable)
+void SteamVR_Vk::DestroyRenderer(VkDevice device, VkDevDispatchTable* pTable)
 {
   if (device == device_)
     renderer_->OnDestroyCompositor(pTable);
diff --git a/GameOverlay/vulkan/src/Compositor/vk_steamvr.h b/GameOverlay/vulkan/src/Compositor/vk_steamvr.h
index 5238137..9ee5bd4 100644
--- a/GameOverlay/vulkan/src/Compositor/vk_steamvr.h
+++ b/GameOverlay/vulkan/src/Compositor/vk_steamvr.h
@@ -31,15 +31,14 @@ namespace CompositorOverlay
 class SteamVR_Vk
 {
 public:
-  void Init(VkLayerDispatchTable* pTable,
+  void Init(VkDevDispatchTable* pTable,
     const VkPhysicalDeviceMemoryProperties& physicalDeviceMemoryProperties,
     VkFormat format, VkImageUsageFlags usage);
-  void Render(const vr::Texture_t *pTexture,
-    VkLayerDispatchTable* pTable,
+ void Render(const vr::Texture_t* pTexture, VkDevDispatchTable* pTable,
     PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr,
     VkQueue queue, uint32_t queueFamilyIndex, VkQueueFlags queueFlags);
 
-  void DestroyRenderer(VkDevice device, VkLayerDispatchTable* pTable);
+  void DestroyRenderer(VkDevice device, VkDevDispatchTable* pTable);
 
   void SetDevice(VkDevice device);
   VkDevice GetDevice() { return device_; }
diff --git a/GameOverlay/vulkan/src/OverlayImageData.cpp b/GameOverlay/vulkan/src/OverlayImageData.cpp
index f7d5bda..135f969 100644
--- a/GameOverlay/vulkan/src/OverlayImageData.cpp
+++ b/GameOverlay/vulkan/src/OverlayImageData.cpp
@@ -24,7 +24,7 @@
 #include "Logging/MessageLog.h"
 
 bool OverlayImageData::CopyBuffer(VkDevice device, VkDeviceSize size, 
-  VkLayerDispatchTable * pTable, PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr, 
+  VkDevDispatchTable* pTable, PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr, 
   VkCommandPool commandPool, VkQueue queue)
 {
   if (commandBuffer[commandBufferIndex] != VK_NULL_HANDLE)
diff --git a/GameOverlay/vulkan/src/OverlayImageData.h b/GameOverlay/vulkan/src/OverlayImageData.h
index 2939a6e..2aadf84 100644
--- a/GameOverlay/vulkan/src/OverlayImageData.h
+++ b/GameOverlay/vulkan/src/OverlayImageData.h
@@ -24,7 +24,8 @@
 
 #define VK_USE_PLATFORM_WIN32_KHR
 #include <assert.h>
-#include <vk_dispatch_table_helper.h>
+#include "vk_dispatch_defs.h"
+#include <vulkan/vk_layer.h>
 #include <vulkan/vulkan.h>
 
 struct OverlayImageData {
@@ -41,7 +42,7 @@ struct OverlayImageData {
   VkDescriptorSet lagIndicatorDescriptorSet;
   bool valid;
 
-  bool CopyBuffer(VkDevice device, VkDeviceSize size, VkLayerDispatchTable* pTable,
+  bool CopyBuffer(VkDevice device, VkDeviceSize size, VkDevDispatchTable* pTable,
     PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr,
     VkCommandPool commandPool, VkQueue queue);
 };
diff --git a/GameOverlay/vulkan/src/Rendering.cpp b/GameOverlay/vulkan/src/Rendering.cpp
index 07a21c1..8ae73d8 100644
--- a/GameOverlay/vulkan/src/Rendering.cpp
+++ b/GameOverlay/vulkan/src/Rendering.cpp
@@ -27,13 +27,13 @@
 
 #include "Recording/Capturing.h"
 
-void Rendering::OnDestroyCompositor(VkLayerDispatchTable* pTable)
+void Rendering::OnDestroyCompositor(VkDevDispatchTable* pTable)
 {
   // check if we actually created a compositor swapchain mapping before
   if (overlayBitmapInitialized_) DestroySwapchain(pTable, &compositorSwapchainMapping_);
 }
 
-void Rendering::OnDestroySwapchain(VkDevice device, VkLayerDispatchTable* pTable,
+void Rendering::OnDestroySwapchain(VkDevice device, VkDevDispatchTable* pTable,
                                    VkSwapchainKHR swapchain)
 {
   SwapchainMapping* sm = swapchainMappings_.Get(swapchain);
@@ -45,7 +45,7 @@ void Rendering::OnDestroySwapchain(VkDevice device, VkLayerDispatchTable* pTable
   delete sm;
 }
 
-void Rendering::DestroySwapchain(VkLayerDispatchTable* pTable, SwapchainMapping* sm)
+void Rendering::DestroySwapchain(VkDevDispatchTable* pTable, SwapchainMapping* sm)
 {
   for (int i = 0; i < 2; ++i) {
     if (sm->overlayImages[i].bufferView != VK_NULL_HANDLE) {
@@ -155,7 +155,7 @@ Rendering::Rendering(const std::wstring& shaderDirectory) : shaderDirectory_(sha
 }
 
 VkResult Rendering::CreateOverlayImageBuffer(
-    VkDevice device, VkLayerDispatchTable* pTable, SwapchainMapping* sm,
+    VkDevice device, VkDevDispatchTable* pTable, SwapchainMapping* sm,
     OverlayImageData& overlayImage, VkBuffer& uniformBuffer,
     VkPhysicalDeviceMemoryProperties physicalDeviceMemoryProperties)
 {
@@ -295,7 +295,7 @@ VkResult Rendering::CreateOverlayImageBuffer(
 }
 
 VkResult Rendering::CreateUniformBuffer(
-    VkDevice device, VkLayerDispatchTable* pTable, SwapchainMapping* sm,
+    VkDevice device, VkDevDispatchTable* pTable, SwapchainMapping* sm,
     VkPhysicalDeviceMemoryProperties physicalDeviceMemoryProperties)
 {
   VkBufferCreateInfo bufferInfo = {VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO};
@@ -372,7 +372,7 @@ VkResult Rendering::CreateUniformBuffer(
 }
 
 bool Rendering::InitRenderPass(
-    VkLayerDispatchTable* pTable,
+    VkDevDispatchTable* pTable,
     const VkPhysicalDeviceMemoryProperties& physicalDeviceMemoryProperties, SwapchainMapping* sm)
 {
   if (!overlayBitmapInitialized_) {
@@ -456,7 +456,7 @@ bool Rendering::InitRenderPass(
 }
 
 void Rendering::OnCreateSwapchain(
-    VkDevice device, VkLayerDispatchTable* pTable,
+    VkDevice device, VkDevDispatchTable* pTable,
     const VkPhysicalDeviceMemoryProperties& physicalDeviceMemoryProperties,
     VkSwapchainKHR swapchain, VkFormat format, const VkExtent2D& extent,
     const VkImageUsageFlags usage)
@@ -468,7 +468,7 @@ void Rendering::OnCreateSwapchain(
   InitRenderPass(pTable, physicalDeviceMemoryProperties, sm);
 }
 
-VkResult Rendering::CreateFrameBuffer(VkLayerDispatchTable* pTable, SwapchainMapping* sm,
+VkResult Rendering::CreateFrameBuffer(VkDevDispatchTable* pTable, SwapchainMapping* sm,
                                       SwapchainImageData& imageData, VkImage& image)
 {
   imageData.image = image;
@@ -510,7 +510,7 @@ VkResult Rendering::CreateFrameBuffer(VkLayerDispatchTable* pTable, SwapchainMap
   return VK_SUCCESS;
 }
 
-bool Rendering::InitPipeline(VkLayerDispatchTable* pTable, uint32_t imageCount, VkImage* images,
+bool Rendering::InitPipeline(VkDevDispatchTable* pTable, uint32_t imageCount, VkImage* images,
                              SwapchainMapping* sm)
 {
   if (sm == nullptr || sm->renderPass == VK_NULL_HANDLE) {
@@ -1135,7 +1135,7 @@ bool Rendering::InitPipeline(VkLayerDispatchTable* pTable, uint32_t imageCount,
   return true;
 }
 
-void Rendering::OnGetSwapchainImages(VkLayerDispatchTable* pTable, VkSwapchainKHR swapchain,
+void Rendering::OnGetSwapchainImages(VkDevDispatchTable* pTable, VkSwapchainKHR swapchain,
                                      uint32_t imageCount, VkImage* images)
 {
   SwapchainMapping* sm = swapchainMappings_.Get(swapchain);
@@ -1143,7 +1143,7 @@ void Rendering::OnGetSwapchainImages(VkLayerDispatchTable* pTable, VkSwapchainKH
 }
 
 bool Rendering::OnInitCompositor(
-    VkDevice device, VkLayerDispatchTable* pTable,
+    VkDevice device, VkDevDispatchTable* pTable,
     const VkPhysicalDeviceMemoryProperties& physicalDeviceMemoryProperties, VkFormat format,
     const VkExtent2D& extent, VkImageUsageFlags usage, uint32_t imageCount, VkImage* images)
 {
@@ -1158,7 +1158,7 @@ bool Rendering::OnInitCompositor(
   return initialized;
 }
 
-VkResult Rendering::UpdateUniformBuffer(VkLayerDispatchTable* pTable, SwapchainMapping* sm)
+VkResult Rendering::UpdateUniformBuffer(VkDevDispatchTable* pTable, SwapchainMapping* sm)
 {
   void* data;
   VkResult result = pTable->MapMemory(sm->device, sm->uniformMemory, 0, 4 * sizeof(int), 0, &data);
@@ -1177,7 +1177,7 @@ VkResult Rendering::UpdateUniformBuffer(VkLayerDispatchTable* pTable, SwapchainM
   return VK_SUCCESS;
 }
 
-VkResult Rendering::UpdateOverlayPosition(VkLayerDispatchTable* pTable, SwapchainMapping* sm,
+VkResult Rendering::UpdateOverlayPosition(VkDevDispatchTable* pTable, SwapchainMapping* sm,
                                           const OverlayBitmap::Position& position)
 {
   sm->overlayRect.offset.x = position.x;
@@ -1192,8 +1192,9 @@ VkResult Rendering::UpdateOverlayPosition(VkLayerDispatchTable* pTable, Swapchai
   return VK_SUCCESS;
 }
 
-VkSemaphore Rendering::Present(VkLayerDispatchTable* pTable,
-                               PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr, VkQueue queue,
+VkSemaphore Rendering::Present(VkDevDispatchTable* pTable,
+                               PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr,
+                               VkQueue queue,
                                uint32_t queueFamilyIndex, VkQueueFlags queueFlags,
                                uint32_t imageIndex, uint32_t waitSemaphoreCount,
                                const VkSemaphore* pWaitSemaphores,
@@ -1257,7 +1258,9 @@ VkSemaphore Rendering::Present(VkLayerDispatchTable* pTable,
     if (imageMapping == nullptr) {
       SwapchainImageMapping im = {};
       im.imageIndex = imageIndex;
-      CreateImageMapping(pTable, setDeviceLoaderDataFuncPtr, swapchainMapping, queueMapping,
+      CreateImageMapping(pTable, 
+          setDeviceLoaderDataFuncPtr, 
+          swapchainMapping, queueMapping,
                          queueFamilyIndex, &im);
       if (im.commandBuffer == VK_NULL_HANDLE) {
         return VK_NULL_HANDLE;
@@ -1354,8 +1357,10 @@ VkSemaphore Rendering::Present(VkLayerDispatchTable* pTable,
   // Make sure that the render pass of every image in the image mapping gets updated.
   if (remainingRecordRenderPassUpdates_ > 0) {
     // Record render pass to update the viewport changes.
-    VkResult result = RecordRenderPass(pTable, setDeviceLoaderDataFuncPtr, swapchainMapping,
-                                       queueMapping, queueFamilyIndex, imageMapping);
+    VkResult result = RecordRenderPass(pTable, 
+        setDeviceLoaderDataFuncPtr,
+        swapchainMapping,
+        queueMapping, queueFamilyIndex, imageMapping);
     if (result != VK_SUCCESS) {
       g_messageLog.LogError("OnPresent", "Failed to record render pass.");
       return VK_NULL_HANDLE;
@@ -1394,7 +1399,7 @@ VkSemaphore Rendering::Present(VkLayerDispatchTable* pTable,
   return imageMapping->semaphore;
 }
 
-VkSemaphore Rendering::OnPresent(VkLayerDispatchTable* pTable,
+VkSemaphore Rendering::OnPresent(VkDevDispatchTable* pTable,
                                  PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr,
                                  VkQueue queue, uint32_t queueFamilyIndex, VkQueueFlags queueFlags,
                                  VkSwapchainKHR swapchain, uint32_t imageIndex,
@@ -1405,12 +1410,14 @@ VkSemaphore Rendering::OnPresent(VkLayerDispatchTable* pTable,
 
   const auto swapchainMapping = swapchainMappings_.Get(swapchain);
 
-  return Present(pTable, setDeviceLoaderDataFuncPtr, queue, queueFamilyIndex, queueFlags,
+  return Present(pTable,
+                 setDeviceLoaderDataFuncPtr,
+                 queue, queueFamilyIndex, queueFlags,
                  imageIndex, waitSemaphoreCount, pWaitSemaphores, swapchainMapping,
                  lagIndicatorState);
 }
 
-VkSemaphore Rendering::OnSubmitFrameCompositor(VkLayerDispatchTable* pTable,
+VkSemaphore Rendering::OnSubmitFrameCompositor(VkDevDispatchTable* pTable,
                                                PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr,
                                                VkQueue queue, uint32_t queueFamilyIndex,
                                                VkQueueFlags queueFlags, uint32_t imageIndex)
@@ -1418,11 +1425,13 @@ VkSemaphore Rendering::OnSubmitFrameCompositor(VkLayerDispatchTable* pTable,
   if (!pipelineInitialized_) return VK_NULL_HANDLE;
 
   // synchronizing should be done via the compositor
-  return Present(pTable, setDeviceLoaderDataFuncPtr, queue, queueFamilyIndex, queueFlags,
+  return Present(pTable,
+                 setDeviceLoaderDataFuncPtr,
+                 queue, queueFamilyIndex, queueFlags,
                  imageIndex, 0, nullptr, &compositorSwapchainMapping_);
 }
 
-VkResult Rendering::RecordRenderPass(VkLayerDispatchTable* pTable,
+VkResult Rendering::RecordRenderPass(VkDevDispatchTable* pTable,
                                      PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr,
                                      SwapchainMapping* sm, SwapchainQueueMapping* qm,
                                      uint32_t queueFamilyIndex, SwapchainImageMapping* im)
@@ -1558,7 +1567,7 @@ VkResult Rendering::RecordRenderPass(VkLayerDispatchTable* pTable,
   return VK_SUCCESS;
 }
 
-void Rendering::CreateImageMapping(VkLayerDispatchTable* pTable,
+void Rendering::CreateImageMapping(VkDevDispatchTable* pTable,
                                    PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr,
                                    SwapchainMapping* sm, SwapchainQueueMapping* qm,
                                    uint32_t queueFamilyIndex, SwapchainImageMapping* im)
@@ -1582,10 +1591,12 @@ void Rendering::CreateImageMapping(VkLayerDispatchTable* pTable,
     return;
   }
 
-  result = RecordRenderPass(pTable, setDeviceLoaderDataFuncPtr, sm, qm, queueFamilyIndex, im);
+  result = RecordRenderPass(pTable, 
+      setDeviceLoaderDataFuncPtr, 
+      sm, qm, queueFamilyIndex, im);
 }
 
-VkShaderModule Rendering::CreateShaderModuleFromFile(VkDevice device, VkLayerDispatchTable* pTable,
+VkShaderModule Rendering::CreateShaderModuleFromFile(VkDevice device, VkDevDispatchTable* pTable,
                                                      const std::wstring& fileName) const
 {
   std::ifstream shaderFile(fileName, std::ios::ate | std::ios::binary);
@@ -1603,8 +1614,7 @@ VkShaderModule Rendering::CreateShaderModuleFromFile(VkDevice device, VkLayerDis
                                       static_cast<uint32_t>(fileSize));
 }
 
-VkShaderModule Rendering::CreateShaderModuleFromBuffer(VkDevice device,
-                                                       VkLayerDispatchTable* pTable,
+VkShaderModule Rendering::CreateShaderModuleFromBuffer(VkDevice device, VkDevDispatchTable* pTable,
                                                        const char* shaderBuffer,
                                                        uint32_t bufferSize) const
 {
diff --git a/GameOverlay/vulkan/src/Rendering.h b/GameOverlay/vulkan/src/Rendering.h
index f7f21b3..5d9869c 100644
--- a/GameOverlay/vulkan/src/Rendering.h
+++ b/GameOverlay/vulkan/src/Rendering.h
@@ -43,28 +43,30 @@ class Rendering final {
   Rendering(const Rendering&) = delete;
   Rendering& operator=(const Rendering&) = delete;
 
-  void OnDestroySwapchain(VkDevice device, VkLayerDispatchTable* pTable, VkSwapchainKHR swapchain);
-  void OnCreateSwapchain(VkDevice device, VkLayerDispatchTable* pTable,
+  void OnDestroySwapchain(VkDevice device, VkDevDispatchTable* pTable, VkSwapchainKHR swapchain);
+  void OnCreateSwapchain(VkDevice device, VkDevDispatchTable* pTable,
     const VkPhysicalDeviceMemoryProperties& physicalDeviceMemoryProperties,
     VkSwapchainKHR swapchain, VkFormat format, const VkExtent2D& extent,
     const VkImageUsageFlags usage);
-  void OnGetSwapchainImages(VkLayerDispatchTable* pTable, VkSwapchainKHR swapchain,
+  void OnGetSwapchainImages(VkDevDispatchTable* pTable, VkSwapchainKHR swapchain,
     uint32_t imageCount, VkImage* images);
 
-  void OnDestroyCompositor(VkLayerDispatchTable* pTable);
-  bool OnInitCompositor(VkDevice device, VkLayerDispatchTable* pTable,
+  void OnDestroyCompositor(VkDevDispatchTable* pTable);
+  bool OnInitCompositor(VkDevice device, VkDevDispatchTable* pTable,
     const VkPhysicalDeviceMemoryProperties& physicalDeviceMemoryProperties,
     VkFormat format, const VkExtent2D& extent, VkImageUsageFlags usage,
     uint32_t imageCount, VkImage* images);
 
-  VkSemaphore OnPresent(VkLayerDispatchTable* pTable,
-    PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr, VkQueue queue,
+  VkSemaphore OnPresent(VkDevDispatchTable* pTable,
+    PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr,
+    VkQueue queue,
     uint32_t queueFamilyIndex, VkQueueFlags queueFlags,
     VkSwapchainKHR swapchain, uint32_t imageIndex, uint32_t waitSemaphoreCount,
     const VkSemaphore* pWaitSemaphores, bool lagIndicatorState = false);
 
-  VkSemaphore OnSubmitFrameCompositor(VkLayerDispatchTable* pTable,
-    PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr, VkQueue queue,
+  VkSemaphore OnSubmitFrameCompositor(VkDevDispatchTable* pTable,
+    PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr,
+    VkQueue queue,
     uint32_t queueFamilyIndex, VkQueueFlags queueFlags,
     uint32_t imageIndex);
 
@@ -75,42 +77,45 @@ class Rendering final {
   bool HideOverlay() { return overlayBitmap_->HideOverlay(); }
 
 protected:
-  void DestroySwapchain(VkLayerDispatchTable* pTable, SwapchainMapping* sm);
+  void DestroySwapchain(VkDevDispatchTable* pTable, SwapchainMapping* sm);
 
-  bool InitRenderPass(VkLayerDispatchTable* pTable,
+  bool InitRenderPass(VkDevDispatchTable* pTable,
     const VkPhysicalDeviceMemoryProperties& physicalDeviceMemoryProperties,
     SwapchainMapping* sm);
 
-  bool InitPipeline(VkLayerDispatchTable* pTable, uint32_t imageCount,
+  bool InitPipeline(VkDevDispatchTable* pTable, uint32_t imageCount,
     VkImage* images, SwapchainMapping* sm);
 
-  VkSemaphore Present(VkLayerDispatchTable* pTable,
-    PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr, VkQueue queue,
+  VkSemaphore Present(VkDevDispatchTable* pTable,
+    PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr,
+    VkQueue queue,
     uint32_t queueFamilyIndex, VkQueueFlags queueFlags,
     uint32_t imageIndex, uint32_t waitSemaphoreCount,
     const VkSemaphore* pWaitSemaphores, SwapchainMapping* swapchainMapping,
     bool lagIndicatorState = false);
 
-  VkResult RecordRenderPass(VkLayerDispatchTable* pTable,
+  VkResult RecordRenderPass(VkDevDispatchTable* pTable,
     PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr,
     SwapchainMapping* sm, SwapchainQueueMapping* qm,
     uint32_t queueFamilyIndex, SwapchainImageMapping* im);
-  void CreateImageMapping(VkLayerDispatchTable* pTable,
+  void CreateImageMapping(VkDevDispatchTable* pTable,
     PFN_vkSetDeviceLoaderData setDeviceLoaderDataFuncPtr,
     SwapchainMapping* sm, SwapchainQueueMapping* qm,
     uint32_t queueFamilyIndex, SwapchainImageMapping* im);
-  VkShaderModule CreateShaderModuleFromFile(VkDevice device, VkLayerDispatchTable* pTable,
+  VkShaderModule CreateShaderModuleFromFile(VkDevice device, VkDevDispatchTable* pTable,
     const std::wstring& fileName) const;
-  VkShaderModule CreateShaderModuleFromBuffer(VkDevice device, VkLayerDispatchTable* pTable,
+  VkShaderModule CreateShaderModuleFromBuffer(VkDevice device, VkDevDispatchTable* pTable,
     const char* shaderBuffer, uint32_t bufferSize) const;
-  VkResult UpdateUniformBuffer(VkLayerDispatchTable * pTable, SwapchainMapping * sm);
-  VkResult UpdateOverlayPosition(VkLayerDispatchTable* pTable,
+  VkResult UpdateUniformBuffer(VkDevDispatchTable* pTable, SwapchainMapping* sm);
+  VkResult UpdateOverlayPosition(VkDevDispatchTable* pTable,
     SwapchainMapping* sm, const OverlayBitmap::Position& position);
-  VkResult CreateOverlayImageBuffer(VkDevice device, VkLayerDispatchTable * pTable,
+  VkResult CreateOverlayImageBuffer(
+      VkDevice device, VkDevDispatchTable* pTable,
     SwapchainMapping * sm, OverlayImageData & overlayImage, VkBuffer & uniformBuffer, VkPhysicalDeviceMemoryProperties physicalDeviceMemoryProperties);
-  VkResult CreateUniformBuffer(VkDevice device, VkLayerDispatchTable * pTable,
+  VkResult CreateUniformBuffer(VkDevice device, VkDevDispatchTable* pTable,
     SwapchainMapping * sm, VkPhysicalDeviceMemoryProperties physicalDeviceMemoryProperties);
-  VkResult CreateFrameBuffer(VkLayerDispatchTable * pTable, SwapchainMapping * sm, SwapchainImageData & imageData, VkImage & image);
+  VkResult CreateFrameBuffer(VkDevDispatchTable* pTable, SwapchainMapping* sm,
+                             SwapchainImageData& imageData, VkImage& image);
 
   HashMap<VkSwapchainKHR, SwapchainMapping*> swapchainMappings_;
   SwapchainMapping compositorSwapchainMapping_;
diff --git a/GameOverlay/vulkan/src/SwapchainMapping.cpp b/GameOverlay/vulkan/src/SwapchainMapping.cpp
index 1767517..5c1b3c0 100644
--- a/GameOverlay/vulkan/src/SwapchainMapping.cpp
+++ b/GameOverlay/vulkan/src/SwapchainMapping.cpp
@@ -22,7 +22,7 @@
 
 #include "SwapchainMapping.h"
 
-void SwapchainMapping::ClearImageData(VkLayerDispatchTable * pTable)
+void SwapchainMapping::ClearImageData(VkDevDispatchTable* pTable)
 {
   for (auto& id : imageData)
   {
diff --git a/GameOverlay/vulkan/src/SwapchainMapping.h b/GameOverlay/vulkan/src/SwapchainMapping.h
index 06cc779..252462a 100644
--- a/GameOverlay/vulkan/src/SwapchainMapping.h
+++ b/GameOverlay/vulkan/src/SwapchainMapping.h
@@ -60,5 +60,5 @@ struct SwapchainMapping {
   std::vector<SwapchainImageData> imageData;
   std::unordered_map<uint32_t, SwapchainQueueMapping> queueMappings;
 
-  void ClearImageData(VkLayerDispatchTable* pTable);
+  void ClearImageData(VkDevDispatchTable* pTable);
 };
diff --git a/GameOverlay/vulkan/src/VK_LAYER_OCAT_overlay.cpp b/GameOverlay/vulkan/src/VK_LAYER_OCAT_overlay.cpp
index de95fa1..296d472 100644
--- a/GameOverlay/vulkan/src/VK_LAYER_OCAT_overlay.cpp
+++ b/GameOverlay/vulkan/src/VK_LAYER_OCAT_overlay.cpp
@@ -22,11 +22,8 @@
 
 #define VK_USE_PLATFORM_WIN32_KHR
 #include <winsock2.h>
-#include <vk_layer_config.h>
-#include <vk_layer_utils.h>
 #include <vulkan/vk_layer.h>
 #include <vulkan/vulkan.h>
-#include "vk_layer_extension_utils.h"
 
 #include "AppResMapping.h"
 #include "Recording/Capturing.h"
@@ -39,10 +36,6 @@
 #include "Compositor/vk_steamvr.h"
 #include "d3d/steamvr.h"
 
-#include <vk_layer_extension_utils.cpp>
-#include <vk_layer_config.cpp>
-#include <vk_layer_utils.cpp>
-
 #include <mutex>
 
 static const VkLayerProperties global_layer = {
@@ -65,12 +58,12 @@ VulkanFunction hookedInstanceFunctions[] = {
     {"vkEnumeratePhysicalDevices",
      reinterpret_cast<PFN_vkVoidFunction>(vkEnumeratePhysicalDevices)},
     {"vkCreateDevice", reinterpret_cast<PFN_vkVoidFunction>(vkCreateDevice)},
-    {"vkEnumerateInstanceLayerProperties",
-     reinterpret_cast<PFN_vkVoidFunction>(vkEnumerateInstanceLayerProperties)},
+    //{"vkEnumerateInstanceLayerProperties",
+    // reinterpret_cast<PFN_vkVoidFunction>(vkEnumerateInstanceLayerProperties)},
     {"vkEnumerateDeviceLayerProperties",
      reinterpret_cast<PFN_vkVoidFunction>(vkEnumerateDeviceLayerProperties)},
-    {"vkEnumerateInstanceExtensionProperties",
-     reinterpret_cast<PFN_vkVoidFunction>(vkEnumerateInstanceExtensionProperties)},
+    //{"vkEnumerateInstanceExtensionProperties",
+    // reinterpret_cast<PFN_vkVoidFunction>(vkEnumerateInstanceExtensionProperties)},
     {"vkEnumerateDeviceExtensionProperties",
      reinterpret_cast<PFN_vkVoidFunction>(vkEnumerateDeviceExtensionProperties)},
     {"vkGetPhysicalDeviceQueueFamilyProperties",
@@ -80,20 +73,100 @@ VulkanFunction hookedInstanceFunctions[] = {
     {"vkGetPhysicalDeviceQueueFamilyProperties2KHR",
      reinterpret_cast<PFN_vkVoidFunction>(vkGetPhysicalDeviceQueueFamilyProperties2KHR) } };
 
+void registerInstanceFunctions(VkInstDispatchTable* pTable, VkInstance instance)
+{
+  PFN_vkGetInstanceProcAddr gpa = pTable->GetInstanceProcAddr;
+  pTable->CreateInstance = (PFN_vkCreateInstance)gpa(instance, "vkCreateInstance");
+  pTable->DestroyInstance = (PFN_vkDestroyInstance)gpa(instance, "vkDestroyInstance");
+  pTable->EnumeratePhysicalDevices = (PFN_vkEnumeratePhysicalDevices)gpa(instance, "vkEnumeratePhysicalDevices");
+  pTable->CreateDevice = (PFN_vkCreateDevice)gpa(instance, "vkCreateDevice");
+  pTable->GetPhysicalDeviceQueueFamilyProperties = (PFN_vkGetPhysicalDeviceQueueFamilyProperties)gpa(instance, "vkGetPhysicalDeviceQueueFamilyProperties");
+  pTable->GetPhysicalDeviceQueueFamilyProperties2 = (PFN_vkGetPhysicalDeviceQueueFamilyProperties2)gpa(instance, "vkGetPhysicalDeviceQueueFamilyProperties2");
+  pTable->GetPhysicalDeviceQueueFamilyProperties2KHR = (PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR)gpa(instance, "vkGetPhysicalDeviceQueueFamilyProperties2KHR");
+  pTable->EnumerateDeviceExtensionProperties = (PFN_vkEnumerateDeviceExtensionProperties)gpa(instance, "vkEnumerateDeviceExtensionProperties");
+  pTable->EnumerateDeviceLayerProperties = (PFN_vkEnumerateDeviceLayerProperties)gpa(instance, "vkEnumerateDeviceLayerProperties");
+  
+  pTable->GetPhysicalDeviceFeatures = (PFN_vkGetPhysicalDeviceFeatures)gpa(instance, "vkGetPhysicalDeviceFeatures");
+  pTable->GetPhysicalDeviceImageFormatProperties = (PFN_vkGetPhysicalDeviceImageFormatProperties)gpa(instance, "vkGetPhysicalDeviceImageFormatProperties");
+  pTable->GetPhysicalDeviceFormatProperties = (PFN_vkGetPhysicalDeviceFormatProperties)gpa(instance, "vkGetPhysicalDeviceFormatProperties");
+  pTable->GetPhysicalDeviceSparseImageFormatProperties = (PFN_vkGetPhysicalDeviceSparseImageFormatProperties)gpa(instance, "vkGetPhysicalDeviceSparseImageFormatProperties");
+  pTable->GetPhysicalDeviceProperties = (PFN_vkGetPhysicalDeviceProperties)gpa(instance, "vkGetPhysicalDeviceProperties");
+  pTable->GetPhysicalDeviceMemoryProperties = (PFN_vkGetPhysicalDeviceMemoryProperties)gpa(instance, "vkGetPhysicalDeviceMemoryProperties");
+  pTable->GetPhysicalDeviceSurfaceCapabilitiesKHR = (PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR)gpa(instance, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR");
+}
+
 VulkanFunction hookedDeviceFunctions[] = {
     {"vkGetDeviceProcAddr", reinterpret_cast<PFN_vkVoidFunction>(vkGetDeviceProcAddr)},
     {"vkDestroyDevice", reinterpret_cast<PFN_vkVoidFunction>(vkDestroyDevice)},
     {"vkGetDeviceQueue", reinterpret_cast<PFN_vkVoidFunction>(vkGetDeviceQueue)}
 };
 
+void registerDeviceFunctions(VkDevDispatchTable* pTable, VkDevice device)
+{
+  PFN_vkGetDeviceProcAddr gpa = pTable->GetDeviceProcAddr;
+  pTable->DestroyDevice = (PFN_vkDestroyDevice)gpa(device, "vkDestroyDevice");
+  pTable->GetDeviceQueue = (PFN_vkGetDeviceQueue)gpa(device, "vkGetDeviceQueue");
+
+  pTable->CreateBuffer = (PFN_vkCreateBuffer)gpa(device, "vkCreateBuffer");
+  pTable->DestroyBufferView = (PFN_vkDestroyBufferView)gpa(device, "vkDestroyBufferView");
+  pTable->DestroyBuffer = (PFN_vkDestroyBuffer)gpa(device, "vkDestroyBuffer");
+  pTable->FreeMemory = (PFN_vkFreeMemory)gpa(device, "vkFreeMemory");
+  pTable->DestroySemaphore = (PFN_vkDestroySemaphore)gpa(device, "vkDestroySemaphore");
+  pTable->DestroyFence = (PFN_vkDestroyFence)gpa(device, "vkDestroyFence");
+  pTable->DestroyRenderPass = (PFN_vkDestroyRenderPass)gpa(device, "vkDestroyRenderPass");
+  pTable->DestroyPipelineLayout = (PFN_vkDestroyPipelineLayout)gpa(device, "vkDestroyPipelineLayout");
+  pTable->DestroyPipeline = (PFN_vkDestroyPipeline)gpa(device, "vkDestroyPipeline");
+  pTable->DestroyCommandPool = (PFN_vkDestroyCommandPool)gpa(device, "vkDestroyCommandPool");
+  pTable->GetBufferMemoryRequirements = (PFN_vkGetBufferMemoryRequirements)gpa(device, "vkGetBufferMemoryRequirements");
+  pTable->AllocateMemory = (PFN_vkAllocateMemory)gpa(device, "vkAllocateMemory");
+  pTable->BindBufferMemory = (PFN_vkBindBufferMemory)gpa(device, "vkBindBufferMemory");
+  pTable->CreateBufferView = (PFN_vkCreateBufferView)gpa(device, "vkCreateBufferView");
+  pTable->CreateSemaphore = (PFN_vkCreateSemaphore)gpa(device, "vkCreateSemaphore");
+  pTable->CreateFence = (PFN_vkCreateFence)gpa(device, "vkCreateFence");
+  pTable->CreateRenderPass = (PFN_vkCreateRenderPass)gpa(device, "vkCreateRenderPass");
+  pTable->CreateImageView = (PFN_vkCreateImageView)gpa(device, "vkCreateImageView");
+  pTable->CreateFramebuffer = (PFN_vkCreateFramebuffer)gpa(device, "vkCreateFramebuffer");
+  pTable->CreateDescriptorPool = (PFN_vkCreateDescriptorPool)gpa(device, "vkCreateDescriptorPool");
+  pTable->CreateDescriptorSetLayout = (PFN_vkCreateDescriptorSetLayout)gpa(device, "vkCreateDescriptorSetLayout");
+  pTable->CreatePipelineLayout = (PFN_vkCreatePipelineLayout)gpa(device, "vkCreatePipelineLayout");
+  pTable->DestroyDescriptorSetLayout = (PFN_vkDestroyDescriptorSetLayout)gpa(device, "vkDestroyDescriptorSetLayout");
+  pTable->AllocateDescriptorSets = (PFN_vkAllocateDescriptorSets)gpa(device, "vkAllocateDescriptorSets");
+  pTable->UpdateDescriptorSets = (PFN_vkUpdateDescriptorSets)gpa(device, "vkUpdateDescriptorSets");
+  pTable->CreateComputePipelines = (PFN_vkCreateComputePipelines)gpa(device, "vkCreateComputePipelines");
+  pTable->DestroyShaderModule = (PFN_vkDestroyShaderModule)gpa(device, "vkDestroyShaderModule");
+  pTable->CreateGraphicsPipelines = (PFN_vkCreateGraphicsPipelines)gpa(device, "vkCreateGraphicsPipelines");
+  pTable->CreateCommandPool = (PFN_vkCreateCommandPool)gpa(device, "vkCreateCommandPool");
+  pTable->MapMemory = (PFN_vkMapMemory)gpa(device, "vkMapMemory");
+  pTable->UnmapMemory = (PFN_vkUnmapMemory)gpa(device, "vkUnmapMemory");
+  pTable->QueueSubmit = (PFN_vkQueueSubmit)gpa(device, "vkQueueSubmit");
+  pTable->BeginCommandBuffer = (PFN_vkBeginCommandBuffer)gpa(device, "vkBeginCommandBuffer");
+  pTable->FreeCommandBuffers = (PFN_vkFreeCommandBuffers)gpa(device, "vkFreeCommandBuffers");
+  pTable->CmdBeginRenderPass = (PFN_vkCmdBeginRenderPass)gpa(device, "vkCmdBeginRenderPass");
+  pTable->CmdBindPipeline = (PFN_vkCmdBindPipeline)gpa(device, "vkCmdBindPipeline");
+  pTable->CmdBindDescriptorSets = (PFN_vkCmdBindDescriptorSets)gpa(device, "vkCmdBindDescriptorSets");
+  pTable->CmdSetViewport = (PFN_vkCmdSetViewport)gpa(device, "vkCmdSetViewport");
+  pTable->CmdDraw = (PFN_vkCmdDraw)gpa(device, "vkCmdDraw");
+  pTable->CmdEndRenderPass = (PFN_vkCmdEndRenderPass)gpa(device, "vkCmdEndRenderPass");
+  pTable->CmdPipelineBarrier = (PFN_vkCmdPipelineBarrier)gpa(device, "vkCmdPipelineBarrier");
+  pTable->CmdDispatch = (PFN_vkCmdDispatch)gpa(device, "vkCmdDispatch");
+  pTable->EndCommandBuffer = (PFN_vkEndCommandBuffer)gpa(device, "vkEndCommandBuffer");
+  pTable->AllocateCommandBuffers = (PFN_vkAllocateCommandBuffers)gpa(device, "vkAllocateCommandBuffers");
+  pTable->CreateShaderModule = (PFN_vkCreateShaderModule)gpa(device, "vkCreateShaderModule");
+  pTable->CmdCopyBuffer = (PFN_vkCmdCopyBuffer)gpa(device, "vkCmdCopyBuffer");
+  pTable->WaitForFences = (PFN_vkWaitForFences)gpa(device, "vkWaitForFences");
+  pTable->ResetFences = (PFN_vkResetFences)gpa(device, "vkResetFences");
+  pTable->DestroyImageView = (PFN_vkDestroyImageView)gpa(device, "vkDestroyImageView");
+  pTable->DestroyFramebuffer = (PFN_vkDestroyFramebuffer)gpa(device, "vkDestroyFramebuffer");
+  pTable->DestroyDescriptorPool = (PFN_vkDestroyDescriptorPool)gpa(device, "vkDestroyDescriptorPool");
+}
+
 VulkanFunction hookedKHRExtFunctions[] = {
     {"vkCreateSwapchainKHR", reinterpret_cast<PFN_vkVoidFunction>(vkCreateSwapchainKHR)},
     {"vkDestroySwapchainKHR", reinterpret_cast<PFN_vkVoidFunction>(vkDestroySwapchainKHR)},
     {"vkGetSwapchainImagesKHR", reinterpret_cast<PFN_vkVoidFunction>(vkGetSwapchainImagesKHR)},
     {"vkQueuePresentKHR", reinterpret_cast<PFN_vkVoidFunction>(vkQueuePresentKHR)}};
 
-void registerDeviceKHRExtFunctions(const VkDeviceCreateInfo* pCreateInfo,
-                                   VkLayerDispatchTable* pTable, VkDevice device)
+void registerDeviceKHRExtFunctions(VkDevDispatchTable* pTable, VkDevice device)
 {
   PFN_vkGetDeviceProcAddr gpa = pTable->GetDeviceProcAddr;
   pTable->CreateSwapchainKHR = (PFN_vkCreateSwapchainKHR)gpa(device, "vkCreateSwapchainKHR");
@@ -102,8 +175,8 @@ void registerDeviceKHRExtFunctions(const VkDeviceCreateInfo* pCreateInfo,
   pTable->QueuePresentKHR = (PFN_vkQueuePresentKHR)gpa(device, "vkQueuePresentKHR");
 }
 
-static HashMap<VkInstance, VkLayerInstanceDispatchTable*> instanceDispatchTable_;
-static HashMap<VkDevice, VkLayerDispatchTable*> deviceDispatchTable_;
+static HashMap<VkInstance, VkInstDispatchTable*> instanceDispatchTable_;
+static HashMap<VkDevice, VkDevDispatchTable*> deviceDispatchTable_;
 static HashMap<VkDevice, PFN_vkSetDeviceLoaderData> deviceLoaderDataFunc_;
 
 void hook_openvr_vulkan_compositor_object() {
@@ -150,7 +223,13 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
 vkCreateInstance(const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator,
                  VkInstance* pInstance)
 {
-  VkLayerInstanceCreateInfo* chain_info = get_chain_info(pCreateInfo, VK_LAYER_LINK_INFO);
+  VkLayerInstanceCreateInfo* chain_info = (VkLayerInstanceCreateInfo*)pCreateInfo->pNext;
+
+  while (chain_info && (chain_info->sType != VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO ||
+                        chain_info->function != VK_LAYER_LINK_INFO)) {
+    chain_info = (VkLayerInstanceCreateInfo*)chain_info->pNext;
+  }
+
   if (!chain_info || !chain_info->u.pLayerInfo) {
     return VK_ERROR_INITIALIZATION_FAILED;
   }
@@ -175,20 +254,25 @@ vkCreateInstance(const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCall
     return result;
   }
 
-  auto instanceDispatchTable = new VkLayerInstanceDispatchTable;
-  layer_init_instance_dispatch_table(*pInstance, instanceDispatchTable, fpGetInstanceProcAddr);
+  // Init Instance Table
+  auto instanceDispatchTable = new VkInstDispatchTable;
+  instanceDispatchTable->GetInstanceProcAddr = fpGetInstanceProcAddr;
+
+  registerInstanceFunctions(instanceDispatchTable, *pInstance);
+
   instanceDispatchTable_.Add(*pInstance, instanceDispatchTable);
 
   g_AppResources.CreateInstance(*pInstance, pCreateInfo);
 
   g_Rendering.reset(new Rendering(g_fileDirectory.GetDirectory(DirectoryType::Bin)));
+
   return result;
 }
 
 VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL
 vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks* pAllocator)
 {
-  VkLayerInstanceDispatchTable* pTable = instanceDispatchTable_.Get(instance);
+  VkInstDispatchTable* pTable = instanceDispatchTable_.Get(instance);
   if (!pTable || pTable->DestroyInstance == NULL) {
     return;
   }
@@ -199,13 +283,14 @@ vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks* pAllocator)
 
   delete pTable;
   instanceDispatchTable_.Remove(instance);
+
   g_Rendering.reset();
 }
 
 VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumeratePhysicalDevices(
     VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices)
 {
-  VkLayerInstanceDispatchTable* pTable = instanceDispatchTable_.Get(instance);
+  VkInstDispatchTable* pTable = instanceDispatchTable_.Get(instance);
   if (!pTable || pTable->EnumeratePhysicalDevices == NULL) {
     return VK_ERROR_INITIALIZATION_FAILED;
   }
@@ -225,7 +310,13 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
 vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo,
                const VkAllocationCallbacks* pAllocator, VkDevice* pDevice)
 {
-  VkLayerDeviceCreateInfo* chain_info = get_chain_info(pCreateInfo, VK_LAYER_LINK_INFO);
+  VkLayerDeviceCreateInfo* chain_info = (VkLayerDeviceCreateInfo*)pCreateInfo->pNext;
+  
+  while (chain_info && (chain_info->sType != VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO ||
+      chain_info->function != VK_LAYER_LINK_INFO)) {
+    chain_info = (VkLayerDeviceCreateInfo*)chain_info->pNext;
+  }
+
   if (!chain_info || !chain_info->u.pLayerInfo) {
     return VK_ERROR_INITIALIZATION_FAILED;
   }
@@ -241,6 +332,9 @@ vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreat
     return VK_ERROR_INITIALIZATION_FAILED;
   }
 
+    // Advance the link info for the next element on the chain
+  chain_info->u.pLayerInfo = chain_info->u.pLayerInfo->pNext;
+
   VkInstance instance = g_AppResources.GetPhysicalDeviceMapping(physicalDevice)->instance;
 
   PFN_vkCreateDevice fpCreateDevice =
@@ -249,22 +343,28 @@ vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreat
     return VK_ERROR_INITIALIZATION_FAILED;
   }
 
-  // Advance the link info for the next element on the chain
-  chain_info->u.pLayerInfo = chain_info->u.pLayerInfo->pNext;
-
   VkResult result = fpCreateDevice(physicalDevice, pCreateInfo, pAllocator, pDevice);
   if (result != VK_SUCCESS) {
     return result;
   }
 
-  chain_info = get_chain_info(pCreateInfo, VK_LOADER_DATA_CALLBACK);
+  chain_info = (VkLayerDeviceCreateInfo*)pCreateInfo->pNext;
+
+  while (chain_info && (chain_info->sType != VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO ||
+      chain_info->function != VK_LOADER_DATA_CALLBACK)) {
+    chain_info = (VkLayerDeviceCreateInfo*)chain_info->pNext;
+  }
+
   if (chain_info) {
     deviceLoaderDataFunc_.Add(*pDevice, chain_info->u.pfnSetDeviceLoaderData);
   }
 
-  auto deviceDispatchTable = new VkLayerDispatchTable;
-  layer_init_device_dispatch_table(*pDevice, deviceDispatchTable, fpGetDeviceProcAddr);
-  registerDeviceKHRExtFunctions(pCreateInfo, deviceDispatchTable, *pDevice);
+  auto deviceDispatchTable = new VkDevDispatchTable;
+  deviceDispatchTable->GetDeviceProcAddr = fpGetDeviceProcAddr;
+
+  registerDeviceFunctions(deviceDispatchTable, *pDevice);
+  registerDeviceKHRExtFunctions(deviceDispatchTable, *pDevice);
+
   deviceDispatchTable_.Add(*pDevice, deviceDispatchTable);
 
   g_AppResources.CreateDevice(*pDevice, physicalDevice, pCreateInfo);
@@ -278,7 +378,7 @@ vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreat
 VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyDevice(VkDevice device,
                                                            const VkAllocationCallbacks* pAllocator)
 {
-  VkLayerDispatchTable* pTable = deviceDispatchTable_.Get(device);
+  VkDevDispatchTable* pTable = deviceDispatchTable_.Get(device);
   if (!pTable || pTable->DestroyDevice == NULL) {
     return;
   }
@@ -298,6 +398,7 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyDevice(VkDevice device,
   pTable->DestroyDevice(device, pAllocator);
 
   delete pTable;
+
   deviceDispatchTable_.Remove(device);
   deviceLoaderDataFunc_.Remove(device);
 }
@@ -306,8 +407,8 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceQueueFamilyPropert
     VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount,
     VkQueueFamilyProperties* pQueueFamilyProperties)
 {
-  VkLayerInstanceDispatchTable* pTable =
-    instanceDispatchTable_.Get(g_AppResources.GetPhysicalDeviceMapping(physicalDevice)->instance);
+  VkInstDispatchTable* pTable =
+      instanceDispatchTable_.Get(g_AppResources.GetPhysicalDeviceMapping(physicalDevice)->instance);
   if (!pTable || pTable->GetPhysicalDeviceQueueFamilyProperties == NULL) {
     return;
   }
@@ -327,8 +428,8 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceQueueFamilyPropert
   VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount,
   VkQueueFamilyProperties2* pQueueFamilyProperties2)
 {
-  VkLayerInstanceDispatchTable* pTable =
-    instanceDispatchTable_.Get(g_AppResources.GetPhysicalDeviceMapping(physicalDevice)->instance);
+  VkInstDispatchTable* pTable =
+      instanceDispatchTable_.Get(g_AppResources.GetPhysicalDeviceMapping(physicalDevice)->instance);
   if (!pTable || pTable->GetPhysicalDeviceQueueFamilyProperties2 == NULL) {
     return;
   }
@@ -354,8 +455,8 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceQueueFamilyPropert
   VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount,
   VkQueueFamilyProperties2KHR* pQueueFamilyProperties2KHR)
 {
-  VkLayerInstanceDispatchTable* pTable =
-    instanceDispatchTable_.Get(g_AppResources.GetPhysicalDeviceMapping(physicalDevice)->instance);
+  VkInstDispatchTable* pTable =
+      instanceDispatchTable_.Get(g_AppResources.GetPhysicalDeviceMapping(physicalDevice)->instance);
   if (!pTable || pTable->GetPhysicalDeviceQueueFamilyProperties2KHR == NULL) {
     return;
   }
@@ -381,7 +482,7 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkGetDeviceQueue(VkDevice device,
     uint32_t queueFamilyIndex,
     uint32_t queueIndex, VkQueue* pQueue)
 {
-  VkLayerDispatchTable* pTable = deviceDispatchTable_.Get(device);
+  VkDevDispatchTable* pTable = deviceDispatchTable_.Get(device);
   if (!pTable || pTable->GetDeviceQueue == NULL) {
     return;
   }
@@ -413,15 +514,15 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
 vkCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateInfoKHR* pCreateInfo,
                      const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchain)
 {
-  VkLayerDispatchTable* pTable = deviceDispatchTable_.Get(device);
+  VkDevDispatchTable* pTable = deviceDispatchTable_.Get(device);
   if (!pTable || pTable->CreateSwapchainKHR == NULL) {
     return VK_ERROR_INITIALIZATION_FAILED;
   }
 
   VkPhysicalDevice physicalDevice = g_AppResources.GetDeviceMapping(device)->physicalDevice;
   VkSwapchainCreateInfoKHR createInfo = *pCreateInfo;
-  VkLayerInstanceDispatchTable* pInstanceTable =
-    instanceDispatchTable_.Get(g_AppResources.GetPhysicalDeviceMapping(physicalDevice)->instance);
+  VkInstDispatchTable* pInstanceTable =
+      instanceDispatchTable_.Get(g_AppResources.GetPhysicalDeviceMapping(physicalDevice)->instance);
   if (!pInstanceTable) {
     return VK_ERROR_INITIALIZATION_FAILED;
   }
@@ -473,7 +574,7 @@ vkCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateInfoKHR* pCreateInf
 VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroySwapchainKHR(
     VkDevice device, VkSwapchainKHR swapchain, const VkAllocationCallbacks* pAllocator)
 {
-  VkLayerDispatchTable* pTable = deviceDispatchTable_.Get(device);
+  VkDevDispatchTable* pTable = deviceDispatchTable_.Get(device);
   if (!pTable || pTable->DestroySwapchainKHR == NULL) {
     return;
   }
@@ -492,7 +593,7 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
 vkGetSwapchainImagesKHR(VkDevice device, VkSwapchainKHR swapchain, uint32_t* pSwapchainImageCount,
                         VkImage* pSwapchainImages)
 {
-  VkLayerDispatchTable* pTable = deviceDispatchTable_.Get(device);
+  VkDevDispatchTable* pTable = deviceDispatchTable_.Get(device);
   if (!pTable || pTable->GetSwapchainImagesKHR == NULL) {
     return VK_ERROR_INITIALIZATION_FAILED;
   }
@@ -512,7 +613,7 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
 vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR* pPresentInfo)
 {
   auto device = g_AppResources.GetQueueMapping(queue)->device;
-  VkLayerDispatchTable* pTable = deviceDispatchTable_.Get(device);
+  VkDevDispatchTable* pTable = deviceDispatchTable_.Get(device);
   if (!pTable || pTable->QueuePresentKHR == NULL) {
     return VK_ERROR_INITIALIZATION_FAILED;
   }
@@ -556,38 +657,53 @@ vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR* pPresentInfo)
   return result;
 }
 
-VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
-vkEnumerateInstanceLayerProperties(uint32_t* pPropertyCount, VkLayerProperties* pProperties)
-{
-  return util_GetLayerProperties(1, &global_layer, pPropertyCount, pProperties);
-}
-
+//VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
+//vkEnumerateInstanceLayerProperties(uint32_t* pPropertyCount, VkLayerProperties* pProperties)
+//{
+//    return util_GetLayerProperties(1, &global_layer, pPropertyCount, pProperties);
+//}
+//
 VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceLayerProperties(
     VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkLayerProperties* pProperties)
 {
-  return util_GetLayerProperties(1, &global_layer, pPropertyCount, pProperties);
-}
+  uint32_t copy_size;
 
-VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceExtensionProperties(
-    const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties)
-{
-  if (pLayerName && strcmp(pLayerName, global_layer.layerName) == 0) {
-    return util_GetExtensionProperties(0, NULL, pPropertyCount, pProperties);
+  if (pProperties == NULL || &global_layer == NULL) {
+    *pPropertyCount = 1;
+    return VK_SUCCESS;
   }
 
-  return VK_ERROR_LAYER_NOT_PRESENT;
+  copy_size = *pPropertyCount < 1 ? *pPropertyCount : 1;
+  memcpy(pProperties, &global_layer, copy_size * sizeof(VkLayerProperties));
+  *pPropertyCount = copy_size;
+  if (copy_size < 1) {
+    return VK_INCOMPLETE;
+  }
+
+  return VK_SUCCESS;
 }
+//
+//VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceExtensionProperties(
+//    const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties)
+//{
+//  if (pLayerName && strcmp(pLayerName, global_layer.layerName) == 0) {
+//    return util_GetExtensionProperties(0, NULL, pPropertyCount, pProperties);
+//  }
+//
+//  return VK_ERROR_LAYER_NOT_PRESENT;
+//}
 
 VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
 vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char* pLayerName,
                                      uint32_t* pPropertyCount, VkExtensionProperties* pProperties)
 {
   if (pLayerName && strcmp(pLayerName, global_layer.layerName) == NULL) {
-    return util_GetExtensionProperties(0, NULL, pPropertyCount, pProperties);
+      *pPropertyCount = 0;
+      return VK_SUCCESS;
   }
 
   auto instance = g_AppResources.GetPhysicalDeviceMapping(physicalDevice)->instance;
-  VkLayerInstanceDispatchTable* pTable = instanceDispatchTable_.Get(instance);
+  VkInstDispatchTable* pTable = instanceDispatchTable_.Get(instance);
   if (!pTable || pTable->EnumerateDeviceExtensionProperties == NULL) {
     return VK_ERROR_INITIALIZATION_FAILED;
   }
@@ -617,7 +733,7 @@ VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr(V
     }
   }
 
-  VkLayerInstanceDispatchTable* pTable = instanceDispatchTable_.Get(instance);
+  VkInstDispatchTable* pTable = instanceDispatchTable_.Get(instance);
   if (!pTable || pTable->GetInstanceProcAddr == NULL) {
     return NULL;
   }
@@ -640,7 +756,7 @@ VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetDeviceProcAddr(VkD
     }
   }
 
-  VkLayerDispatchTable* pTable = deviceDispatchTable_.Get(device);
+  VkDevDispatchTable* pTable = deviceDispatchTable_.Get(device);
   if (!pTable || pTable->GetDeviceProcAddr == NULL) {
     return NULL;
   }
@@ -655,7 +771,7 @@ OVR_PUBLIC_FUNCTION(ovrResult) ovr_EndFrame(ovrSession session, long long frameI
                                             ovrLayerHeader const* const* layerPtrList,
                                             unsigned int layerCount)
 {
-  VkLayerDispatchTable* pTable = deviceDispatchTable_.Get(g_OculusVk->GetDevice());
+  VkDevDispatchTable* pTable = deviceDispatchTable_.Get(g_OculusVk->GetDevice());
   VkPhysicalDevice physicalDevice = g_AppResources.GetDeviceMapping(
     g_OculusVk->GetDevice())->physicalDevice;
 
@@ -724,7 +840,7 @@ IVRCompositor_Submit(vr::IVRCompositor* pCompositor, vr::EVREye eEye,
   {
     if (g_SteamVRVk->IsInitialized())
     {
-      VkLayerDispatchTable* pTable = deviceDispatchTable_.Get(g_SteamVRVk->GetDevice());
+      VkDevDispatchTable* pTable = deviceDispatchTable_.Get(g_SteamVRVk->GetDevice());
       VkPhysicalDevice physicalDevice = g_AppResources.GetDeviceMapping(
         g_SteamVRVk->GetDevice())->physicalDevice;
       vr::VRVulkanTextureData_t* vkTextureData =
diff --git a/GameOverlay/vulkan/src/gen_dispatch_table.py b/GameOverlay/vulkan/src/gen_dispatch_table.py
new file mode 100644
index 0000000..90edccc
--- /dev/null
+++ b/GameOverlay/vulkan/src/gen_dispatch_table.py
@@ -0,0 +1,200 @@
+#!/usr/bin/env python3
+
+import os
+import io
+import sys
+import re
+import xml.etree.ElementTree as ET
+
+# on msys, use crlf output
+nl = None
+if sys.platform == 'msys':
+    nl = "\r\n"
+
+# Get the file, relative to this script's location (same directory)
+# that way we're not sensitive to CWD
+pathname = os.path.abspath(os.path.dirname(sys.argv[0])) + os.path.sep
+
+# open the file for write
+f = open(pathname + 'vk_dispatch_defs.h', mode='w', newline = nl)
+
+# open XML registry
+registry = ET.parse(pathname + 'vk.xml').getroot()
+
+# f.write the file, starting with a template header
+f.write('''
+/******************************************************************************
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Baldur Karlsson
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ ******************************************************************************/
+
+/******************************************************************************
+ * Generated from Khronos's vk.xml:
+'''.lstrip())
+
+def prefix_star(line):
+    if line == '':
+        return ' *'
+    else:
+        return ' * ' + line
+
+# Print the first two comments with the license
+for comment in registry.findall('comment')[0:2]:
+    f.write("\n".join([prefix_star(line.strip()) for line in comment.text.split('\n')]))
+
+f.write('''
+ ******************************************************************************/
+
+// This file is autogenerated with gen_dispatch_table.py - any changes will be overwritten next time
+// that script is run.
+// $ ./gen_spirv_code.py
+
+#pragma once
+
+#include <vulkan/vulkan.h>
+
+// this file is autogenerated, so don't worry about clang-format issues
+// clang-format off
+'''.lstrip())
+
+platform_defines = {}
+
+# Cache the platform defines that protect each platform name
+for plat in registry.findall('platforms/platform'):
+    platform_defines[plat.attrib['name']] = plat.attrib['protect']
+
+# Process all commands and categorise into instance or device
+commands = {}
+INSTANCE_CMD = 1
+DEVICE_CMD = 2
+
+# Some special cases we manually set
+commands['vkCreateInstance'] = INSTANCE_CMD
+commands['vkEnumerateInstanceVersion'] = INSTANCE_CMD
+commands['vkEnumerateInstanceLayerProperties'] = INSTANCE_CMD
+commands['vkEnumerateInstanceExtensionProperties'] = INSTANCE_CMD
+
+import xml
+
+for cmd in registry.findall('commands/command'):
+
+    if 'alias' in cmd.attrib:
+        name = cmd.attrib['name']
+        alias = cmd.attrib['alias']
+        if alias not in commands:
+            raise ValueError('alias {} of {} defined, but {} is unknown'.format(name, alias, alias))
+
+        commands[name] = commands[alias]
+        continue
+
+    name = cmd.find('proto/name').text
+    if name in commands:
+        continue
+
+    first_param_type = cmd.find('param/type').text
+
+    if first_param_type == 'VkInstance' or first_param_type == 'VkPhysicalDevice':
+        commands[name] = INSTANCE_CMD
+    elif first_param_type == 'VkDevice' or first_param_type == 'VkQueue' or first_param_type == 'VkCommandBuffer':
+        commands[name] = DEVICE_CMD
+    else:
+        raise ValueError('type {} of first parameter to {} is unexpected'.format(first_param_type, name))
+
+inst_commands = ""
+dev_commands = ""
+processed_commands = [] # some commands come from multiple extensions. Include them only in the first
+
+def process_feature(root, name):
+    global inst_commands, dev_commands, processed_commands
+
+    inst = ""
+    dev = ""
+
+    for req in root.findall('require'):
+        for cmd in req.findall('command'):
+            function = cmd.attrib['name']
+
+            if function in processed_commands:
+                continue
+
+            processed_commands.append(function)
+
+            if function not in commands:
+                raise ValueError('command {} referenced by {} is unknown'.format(function, name))
+
+            table = commands[function]
+
+            if table == INSTANCE_CMD:
+                inst += '\n  PFN_{} {};'.format(function, function[2:])
+            elif table == DEVICE_CMD:
+                dev += '\n  PFN_{} {};'.format(function, function[2:])
+            else:
+                raise ValueError('command {} has unknown table type {}'.format(function, table))
+
+    if 'platform' in root.attrib:
+        if inst != "":
+            inst = '\n#ifdef {plat}{inst}\n#endif // {plat}'.format(plat = platform_defines[root.attrib['platform']], inst = inst)
+        if dev != "":
+            dev = '\n#ifdef {plat}{dev}\n#endif // {plat}'.format(plat = platform_defines[root.attrib['platform']], dev = dev)
+
+    if inst != "":
+        inst_commands += "  // {name}{inst}\n\n".format(**locals())
+    if dev != "":
+        dev_commands += "  // {name}{dev}\n\n".format(**locals())
+
+# Look at all features
+for feat in registry.findall('feature'):
+    # Only process vulkan features
+    if 'api' in feat.attrib and feat.attrib['api'] == 'vulkan':
+        process_feature(feat, feat.attrib['comment'])
+
+# And all extensions (with KHR extensions sorted to the front)
+def ext_sort(ext):
+    if 'KHR' in ext.attrib['name']:
+        return int(ext.attrib['number'])
+    return 10000000 + int(ext.attrib['number'])
+
+
+for ext in sorted(registry.findall('extensions/extension'), key=ext_sort):
+    # Only process vulkan extensions
+    if 'supported' in ext.attrib and ext.attrib['supported'] == 'vulkan':
+
+        process_feature(ext, ext.attrib['name'])
+
+inst_commands = inst_commands.strip()
+dev_commands = dev_commands.strip()
+
+f.write('''
+struct VkInstDispatchTable
+{{
+  {inst_commands}
+}};
+
+struct VkDevDispatchTable
+{{
+  {dev_commands}
+
+  // for consistency with macros, we declare the CreateDevice pointer here
+  // even though it won't actually ever get used and is on the instance dispatch chain
+  PFN_vkCreateDevice CreateDevice;
+}};
+'''.format(**locals()))
diff --git a/GlobalHook/GlobalHook.vcxproj b/GlobalHook/GlobalHook.vcxproj
index 8a719ed..89050ad 100644
--- a/GlobalHook/GlobalHook.vcxproj
+++ b/GlobalHook/GlobalHook.vcxproj
@@ -22,34 +22,34 @@
     <ProjectGuid>{D5D1B9A8-B627-47E9-B469-E7A3E699F85F}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>GlobalHook</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/ags_lib/LICENSE.txt b/IHVs/ags_lib/LICENSE.txt
similarity index 100%
rename from ags_lib/LICENSE.txt
rename to IHVs/ags_lib/LICENSE.txt
diff --git a/ags_lib/inc/amd_ags.h b/IHVs/ags_lib/inc/amd_ags.h
similarity index 100%
rename from ags_lib/inc/amd_ags.h
rename to IHVs/ags_lib/inc/amd_ags.h
diff --git a/ags_lib/lib/amd_ags_x64.dll b/IHVs/ags_lib/lib/amd_ags_x64.dll
similarity index 100%
rename from ags_lib/lib/amd_ags_x64.dll
rename to IHVs/ags_lib/lib/amd_ags_x64.dll
diff --git a/ags_lib/lib/amd_ags_x64.lib b/IHVs/ags_lib/lib/amd_ags_x64.lib
similarity index 100%
rename from ags_lib/lib/amd_ags_x64.lib
rename to IHVs/ags_lib/lib/amd_ags_x64.lib
diff --git a/ags_lib/lib/amd_ags_x86.dll b/IHVs/ags_lib/lib/amd_ags_x86.dll
similarity index 100%
rename from ags_lib/lib/amd_ags_x86.dll
rename to IHVs/ags_lib/lib/amd_ags_x86.dll
diff --git a/ags_lib/lib/amd_ags_x86.lib b/IHVs/ags_lib/lib/amd_ags_x86.lib
similarity index 100%
rename from ags_lib/lib/amd_ags_x86.lib
rename to IHVs/ags_lib/lib/amd_ags_x86.lib
diff --git a/IHVs/gpudetect/DeviceId.cpp b/IHVs/gpudetect/DeviceId.cpp
new file mode 100644
index 0000000..da12d12
--- /dev/null
+++ b/IHVs/gpudetect/DeviceId.cpp
@@ -0,0 +1,147 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright 2017-2018 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+////////////////////////////////////////////////////////////////////////////////
+
+#include <cassert>
+#include "DeviceId.h"
+
+
+namespace GPUDetect
+{
+
+	char const* GetIntelGPUArchitectureString( INTEL_GPU_ARCHITECTURE arch )
+	{
+		switch( arch )
+		{
+		case IGFX_SANDYBRIDGE:   return "Sandy Bridge";
+		case IGFX_IVYBRIDGE:     return "Ivy Bridge";
+		case IGFX_HASWELL:       return "Haswell";
+		case IGFX_VALLEYVIEW:    return "ValleyView";
+		case IGFX_BROADWELL:     return "Broadwell";
+		case IGFX_CHERRYVIEW:    return "Cherryview";
+		case IGFX_SKYLAKE:       return "Skylake";
+		case IGFX_KABYLAKE:      return "Kabylake";
+		case IGFX_COFFEELAKE:    return "Coffeelake";
+		case IGFX_WILLOWVIEW:    return "Willowview";
+		case IGFX_BROXTON:       return "Broxton";
+		case IGFX_GEMINILAKE:    return "Geminilake";
+
+		case IGFX_CANNONLAKE:    return "Cannonlake";
+
+		case IGFX_ICELAKE:       return "Icelake";
+		case IGFX_ICELAKE_LP:    return "Icelake LP";
+		case IGFX_LAKEFIELD:     return "Lakefield";
+
+		case IGFX_TIGERLAKE_LP:  return "Tigerlake LP";
+
+		case IGFX_ROCKETLAKE:	 return "Rocketlake";
+
+		case IGFX_DG1:           return "DG1";
+
+		// Architectures with no unique enum value, but that still can be determined from DeviceID
+		case IGFX_WHISKEYLAKE:   return "Whiskeylake";
+		case IGFX_COMETLAKE:	 return "Cometlake";
+
+		case IGFX_UNKNOWN:
+		case IGFX_MAX_PRODUCT:
+		default:
+			assert(false);
+			return "Unknown";
+		}
+	}
+
+	INTEL_GPU_ARCHITECTURE GetIntelGPUArchitecture( unsigned int deviceId )
+	{
+		const unsigned int idhi = deviceId & 0xFF00;
+		const unsigned int idlo = deviceId & 0x00FF;
+
+		if( idhi == 0x0100 )
+		{
+			if( ( idlo & 0xFFF0 ) == 0x0050 || ( idlo & 0xFFF0 ) == 0x0060 )
+			{
+				return IGFX_IVYBRIDGE;
+			}
+			return IGFX_SANDYBRIDGE;
+		}
+
+		if( idhi == 0x0400 || idhi == 0x0A00 || idhi == 0x0D00 || idhi == 0x0C00 )
+		{
+			return IGFX_HASWELL;
+		}
+
+		if( idhi == 0x1600 || idhi == 0x0B00 )
+		{
+			return IGFX_BROADWELL;
+		}
+
+		if( idhi == 0x1900 || idhi == 0x0900 )
+		{
+			return IGFX_SKYLAKE;
+		}
+
+		if( idhi == 0x5900 )
+		{
+			return IGFX_KABYLAKE;
+		}
+
+		if( idhi == 0x3100 )
+		{
+			return IGFX_GEMINILAKE;;
+		}
+
+		if( idhi == 0x5A00 || idhi == 0x0A00 )
+		{
+			return IGFX_CANNONLAKE;
+		}
+
+		if( idhi == 0x3E00 )
+		{
+			if( idlo == 0x00A0 || idlo == 0x00A1 )
+			{
+				return IGFX_WHISKEYLAKE;
+			}
+			return IGFX_COFFEELAKE;
+		}
+
+		if ( idhi == 0x8A00 )
+		{
+			return IGFX_ICELAKE_LP;
+		}
+
+		if( idhi == 0x9A00 )
+		{
+			return IGFX_TIGERLAKE_LP;
+		}
+
+		if( idhi == 0x4900 )
+		{
+			return IGFX_DG1;
+		}
+
+		if (idhi == 0x4C00)
+		{
+			return IGFX_ROCKETLAKE;
+		}
+
+		if (idhi == 0x9B00)
+		{
+			return IGFX_COMETLAKE;
+		}
+
+		assert(false);
+		return IGFX_UNKNOWN;
+	}
+
+}
diff --git a/IHVs/gpudetect/DeviceId.h b/IHVs/gpudetect/DeviceId.h
new file mode 100644
index 0000000..faa4460
--- /dev/null
+++ b/IHVs/gpudetect/DeviceId.h
@@ -0,0 +1,80 @@
+/////////////////////////////////////////////////////////////////////////////////////////////
+// Copyright 2017-2018 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+/////////////////////////////////////////////////////////////////////////////////////////////
+
+
+#pragma once
+
+
+namespace GPUDetect
+{
+	enum INTEL_GPU_ARCHITECTURE
+	{
+		IGFX_UNKNOWN = 0x00,
+
+		IGFX_SANDYBRIDGE = 0x0c,
+		IGFX_IVYBRIDGE,
+		IGFX_HASWELL,
+		IGFX_VALLEYVIEW,
+		IGFX_BROADWELL,
+		IGFX_CHERRYVIEW,
+		IGFX_SKYLAKE,
+		IGFX_KABYLAKE,
+		IGFX_COFFEELAKE,
+		IGFX_WILLOWVIEW,
+		IGFX_BROXTON,
+		IGFX_GEMINILAKE,
+
+		IGFX_CANNONLAKE = 0x1a,
+
+		IGFX_ICELAKE = 0x1c,
+		IGFX_ICELAKE_LP,
+
+		IGFX_LAKEFIELD = 0x1e,
+
+		IGFX_TIGERLAKE_LP = 0x21,
+		
+		IGFX_ROCKETLAKE = 0x23, 
+
+		IGFX_DG1 = 0x4ba,
+
+		IGFX_MAX_PRODUCT,
+
+		// Architectures with no enum value
+		IGFX_WHISKEYLAKE,
+		IGFX_COMETLAKE
+	};
+
+	/*******************************************************************************
+	 * getIntelGPUArchitecture
+	 *
+	 *      Returns the architecture of an Intel GPU by parsing the device id.  It
+	 *      assumes that it is indeed an Intel GPU device ID (i.e., that VendorID
+	 *      was INTEL_VENDOR_ID).
+	 *
+	 *      You cannot generally compare device IDs to compare architectures; for
+	 *      example, a newer architecture may have an lower deviceID.
+	 *
+	 ******************************************************************************/
+	INTEL_GPU_ARCHITECTURE GetIntelGPUArchitecture( unsigned int deviceId );
+
+	/*******************************************************************************
+	 * getIntelGPUArchitectureString
+	 *
+	 *     Convert A INTEL_GPU_ARCHITECTURE to a string.
+	 *
+	 ******************************************************************************/
+	char const* GetIntelGPUArchitectureString( INTEL_GPU_ARCHITECTURE arch );
+}
diff --git a/IHVs/gpudetect/GPUDetect.cpp b/IHVs/gpudetect/GPUDetect.cpp
new file mode 100644
index 0000000..593dc8e
--- /dev/null
+++ b/IHVs/gpudetect/GPUDetect.cpp
@@ -0,0 +1,805 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright 2017-2020 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+////////////////////////////////////////////////////////////////////////////////
+
+
+#ifndef STRICT
+#define STRICT
+#endif
+
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifndef VC_EXTRALEAN
+#define VC_EXTRALEAN
+#endif
+
+#include <windows.h>
+
+#include <dxgi.h>
+#include <d3d11.h>
+#ifdef _WIN32_WINNT_WIN10
+#include <d3d11_3.h>
+#endif
+
+#include "ID3D10Extensions.h"
+
+#include <winreg.h>
+#include <tchar.h>
+
+#include <cassert>
+#include <cstdlib>
+#include <cstdio>
+
+#include "GPUDetect.h"
+
+
+// These should only be needed for reading data from the counter
+struct IntelDeviceInfo1
+{
+	DWORD GPUMaxFreq;
+	DWORD GPUMinFreq;
+};
+static_assert( sizeof(IntelDeviceInfo1) == 8, "struct size mismatch" );
+
+struct IntelDeviceInfo2 : public IntelDeviceInfo1
+{
+	DWORD GPUArchitecture;   // should match INTEL_GPU_ARCHITECTURE
+	DWORD EUCount;
+	DWORD PackageTDP;
+	DWORD MaxFillRate;
+};
+static_assert( sizeof(IntelDeviceInfo2) == 24, "struct size mismatch" );
+
+
+namespace GPUDetect
+{
+
+// Returns EXIT_SUCCESS if successfully initialized
+int GetIntelDeviceInfo( IntelDeviceInfo2* deviceInfo, ID3D11Device* device );
+
+
+int InitAll( GPUData* const gpuData, int adapterIndex )
+{
+	if( gpuData == nullptr || adapterIndex < 0 )
+	{
+		return GPUDETECT_ERROR_BAD_DATA;
+	}
+
+	IDXGIAdapter* adapter = nullptr;
+	int returnCode = InitAdapter( &adapter, adapterIndex );
+	if( returnCode != EXIT_SUCCESS )
+	{
+		return returnCode;
+	}
+
+	ID3D11Device* device = nullptr;
+	returnCode = InitDevice( adapter, &device );
+	if( returnCode != EXIT_SUCCESS )
+	{
+		adapter->Release();
+		return returnCode;
+	}
+
+	returnCode = InitAll( gpuData, adapter, device );
+
+	adapter->Release();
+	device->Release();
+	return returnCode;
+}
+
+int InitAll( GPUData* const gpuData, IDXGIAdapter* adapter, ID3D11Device* device )
+{
+	int returnCode = InitExtensionInfo( gpuData, adapter, device );
+	if( returnCode != EXIT_SUCCESS )
+	{
+		return returnCode;
+	}
+
+	returnCode = InitDxDriverVersion( gpuData );
+	if( returnCode != EXIT_SUCCESS )
+	{
+		return returnCode;
+	}
+
+	returnCode = InitCounterInfo( gpuData, device );
+
+	return returnCode;
+}
+
+int InitExtensionInfo( GPUData* const gpuData, int adapterIndex )
+{
+	if( gpuData == nullptr || adapterIndex < 0 )
+	{
+		return GPUDETECT_ERROR_BAD_DATA;
+	}
+
+	IDXGIAdapter* adapter = nullptr;
+	int returnCode = InitAdapter( &adapter, adapterIndex );
+	if( returnCode != EXIT_SUCCESS )
+	{
+		return returnCode;
+	}
+
+	ID3D11Device* device = nullptr;
+	returnCode = InitDevice( adapter, &device );
+	if( returnCode != EXIT_SUCCESS )
+	{
+		adapter->Release();
+		return returnCode;
+	}
+
+	returnCode = InitExtensionInfo( gpuData, adapter, device );
+
+	adapter->Release();
+	device->Release();
+	return returnCode;
+}
+
+int InitExtensionInfo( GPUData* const gpuData, IDXGIAdapter* adapter, ID3D11Device* device )
+{
+	if ( gpuData == nullptr || adapter == nullptr || device == nullptr )
+	{
+		return GPUDETECT_ERROR_BAD_DATA;
+	}
+
+	// basic DXGI information
+	DXGI_ADAPTER_DESC AdapterDesc = {};
+	if( FAILED( adapter->GetDesc( &AdapterDesc ) ) )
+	{
+		return GPUDETECT_ERROR_DXGI_ADAPTER_CREATION;
+	}
+
+	gpuData->dxAdapterAvailability = true;
+
+	gpuData->vendorID = AdapterDesc.VendorId;
+	gpuData->deviceID = AdapterDesc.DeviceId;
+	gpuData->adapterLUID = AdapterDesc.AdapterLuid;
+
+	wcscpy_s( gpuData->description, _countof( GPUData::description ), AdapterDesc.Description );
+
+	if( AdapterDesc.VendorId == INTEL_VENDOR_ID && AdapterDesc.DedicatedVideoMemory <= 512 * 1024 * 1024 )
+	{
+		gpuData->isUMAArchitecture = true;
+	}
+
+#ifdef _WIN32_WINNT_WIN10
+	ID3D11Device3* pDevice3 = nullptr;
+	if( SUCCEEDED( device->QueryInterface( __uuidof( ID3D11Device3 ), (void**) &pDevice3 ) ) )
+	{
+		D3D11_FEATURE_DATA_D3D11_OPTIONS2 FeatureData = {};
+		if( SUCCEEDED( pDevice3->CheckFeatureSupport( D3D11_FEATURE_D3D11_OPTIONS2, &FeatureData, sizeof( FeatureData ) ) ) )
+		{
+			gpuData->isUMAArchitecture = FeatureData.UnifiedMemoryArchitecture == TRUE;
+		}
+		pDevice3->Release();
+	}
+#endif // _WIN32_WINNT_WIN10
+
+	if( gpuData->isUMAArchitecture )
+	{
+		gpuData->videoMemory = AdapterDesc.SharedSystemMemory;
+	}
+	else
+	{
+		gpuData->videoMemory = AdapterDesc.DedicatedVideoMemory;
+	}
+
+	// Intel specific information
+	if( AdapterDesc.VendorId == INTEL_VENDOR_ID )
+	{
+		gpuData->architecture = GetIntelGPUArchitecture(gpuData->deviceID);
+
+		ID3D10::CAPS_EXTENSION intelExtCaps = {};
+		if (S_OK == GetExtensionCaps(device, &intelExtCaps))
+		{
+			gpuData->extensionVersion = intelExtCaps.DriverVersion;
+			gpuData->intelExtensionAvailability = (gpuData->extensionVersion >= ID3D10::EXTENSION_INTERFACE_VERSION_1_0);
+		}
+	}
+
+	return EXIT_SUCCESS;
+}
+
+int InitCounterInfo( GPUData* const gpuData, int adapterIndex )
+{
+	if( gpuData == nullptr || adapterIndex < 0 )
+	{
+		return GPUDETECT_ERROR_BAD_DATA;
+	}
+
+	IDXGIAdapter* adapter = nullptr;
+	int returnCode = InitAdapter( &adapter, adapterIndex );
+	if( returnCode != EXIT_SUCCESS )
+	{
+		return returnCode;
+	}
+
+	ID3D11Device* device = nullptr;
+	returnCode = InitDevice( adapter, &device );
+	if( returnCode != EXIT_SUCCESS )
+	{
+		adapter->Release();
+		return returnCode;
+	}
+
+	returnCode = InitCounterInfo( gpuData, device );
+
+	adapter->Release();
+	return returnCode;
+}
+
+int InitCounterInfo( GPUData* const gpuData, ID3D11Device* device )
+{
+	if( gpuData == nullptr || device == nullptr || gpuData->vendorID == 0 || gpuData->deviceID == 0 )
+	{
+		return GPUDETECT_ERROR_BAD_DATA;
+	}
+
+	//
+	// In DirectX, Intel exposes additional information through the driver that can be obtained
+	// querying a special DX counter
+	//
+	gpuData->counterAvailability = gpuData->vendorID == INTEL_VENDOR_ID;
+	if( !gpuData->counterAvailability )
+	{
+		return GPUDETECT_ERROR_NOT_SUPPORTED;
+	}
+
+	IntelDeviceInfo2 info = {};
+	const int deviceInfoReturnCode = GetIntelDeviceInfo( &info, device );
+	if (deviceInfoReturnCode != EXIT_SUCCESS)
+	{
+		return deviceInfoReturnCode;
+	}
+	else
+	{
+		gpuData->maxFrequency = info.GPUMaxFreq;
+		gpuData->minFrequency = info.GPUMinFreq;
+
+		//
+		// Older versions of the IntelDeviceInfo query only return
+		// GPUMaxFreq and GPUMinFreq, all other members will be zero.
+		//
+		if (info.GPUArchitecture != IGFX_UNKNOWN)
+		{
+			gpuData->advancedCounterDataAvailability = true;
+
+			gpuData->architecture = (INTEL_GPU_ARCHITECTURE)info.GPUArchitecture;
+			assert(gpuData->architecture == GetIntelGPUArchitecture(gpuData->deviceID));
+
+			gpuData->euCount = info.EUCount;
+			gpuData->packageTDP = info.PackageTDP;
+			gpuData->maxFillRate = info.MaxFillRate;
+		}
+	}
+
+	return EXIT_SUCCESS;
+}
+
+PresetLevel GetDefaultFidelityPreset( const GPUData* const gpuData )
+{
+	// Return if prerequisite info is not met
+	if( !gpuData->dxAdapterAvailability )
+	{
+		return PresetLevel::Undefined;
+	}
+
+	//
+	// Look for a config file that qualifies devices from any vendor
+	// The code here looks for a file with one line per recognized graphics
+	// device in the following format:
+	//
+	// VendorIDHex, DeviceIDHex, CapabilityEnum      ;Commented name of card
+	//
+
+	const char* cfgFileName = nullptr;
+
+	switch( gpuData->vendorID )
+	{
+	case INTEL_VENDOR_ID:
+		cfgFileName = "IntelGfx.cfg";
+		break;
+
+		// Add other cases in this fashion to allow for additional cfg files
+		//case SOME_VENDOR_ID:
+		//    cfgFileName =  "OtherBrandGfx.cfg";
+		//    break;
+
+	default:
+		return PresetLevel::Undefined;;
+	}
+
+	PresetLevel presets = Undefined;
+
+	FILE* fp = nullptr;
+	fopen_s( &fp, cfgFileName, "r" );
+
+	if( fp )
+	{
+		char line[ 100 ];
+
+		//
+		// read one line at a time till EOF
+		//
+		while( fgets( line, _countof( line ), fp ) )
+		{
+			//
+			// Parse and remove the comment part of any line
+			//
+			unsigned int i = 0;
+			for( ; i < _countof( line ) - 1 && line[ i ] && line[ i ] != ';'; i++ )
+			{}
+			line[ i ] = '\0';
+
+			//
+			// Try to extract GPUVendorId, GPUDeviceId and recommended Default Preset Level
+			//
+			char* context = nullptr;
+			const char* const szVendorId = strtok_s( line, ",\n", &context );
+			const char* const szDeviceId = strtok_s( nullptr, ",\n", &context );
+			const char* const szPresetLevel = strtok_s( nullptr, ",\n", &context );
+
+			if( ( szVendorId == nullptr ) ||
+				( szDeviceId == nullptr ) ||
+				( szPresetLevel == nullptr ) )
+			{
+				continue;  // blank or improper line in cfg file - skip to next line
+			}
+
+			unsigned int vId = 0;
+			int rv = sscanf_s( szVendorId, "%x", &vId );
+			assert( rv == 1 );
+
+			unsigned int dId = 0;
+			rv = sscanf_s( szDeviceId, "%x", &dId );
+			assert( rv == 1 );
+
+			//
+			// If current graphics device is found in the cfg file, use the
+			// pre-configured default Graphics Presets setting.
+			//
+			if( ( vId == gpuData->vendorID ) && ( dId == gpuData->deviceID ) )
+			{
+				char s[ 10 ] = {};
+				sscanf_s( szPresetLevel, "%s", s, (unsigned int) _countof( s ) );
+
+				if( !_stricmp( s, "Low" ) )
+					presets = Low;
+				else if( !_stricmp( s, "Medium" ) )
+					presets = Medium;
+				else if( !_stricmp( s, "Medium+" ) )
+					presets = MediumPlus;
+				else if( !_stricmp( s, "High" ) )
+					presets = High;
+				else
+					presets = NotCompatible;
+
+				break;
+			}
+		}
+
+		fclose( fp );
+	}
+	else
+	{
+		fprintf( stderr, "Error: %s not found! Fallback to default presets.\n", cfgFileName );
+	}
+
+	//
+	// If the current graphics device was not listed in any of the config
+	// files, or if config file not found, use Low settings as default.
+	// This should be changed to reflect the desired behavior for unknown
+	// graphics devices.
+	//
+	if( presets == Undefined )
+	{
+		presets = Low;
+	}
+
+	return presets;
+}
+
+int InitDxDriverVersion( GPUData* const gpuData )
+{
+	if( gpuData == nullptr || !( gpuData->dxAdapterAvailability == true ) )
+	{
+		return GPUDETECT_ERROR_BAD_DATA;
+	}
+
+	if( gpuData->adapterLUID.HighPart == 0 && gpuData->adapterLUID.LowPart == 0 )
+	{
+		// This should not happen with an active/current adapter.
+		// But the registry can contain old leftover driver entries with LUID == 0.
+		return GPUDETECT_ERROR_BAD_DATA;
+	}
+
+	// Fetch registry data
+	HKEY dxKeyHandle = nullptr;
+	DWORD numOfAdapters = 0;
+
+	LSTATUS returnCode = ::RegOpenKeyEx( HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\DirectX"), 0, KEY_READ, &dxKeyHandle );
+
+	if( returnCode != ERROR_SUCCESS )
+	{
+		return GPUDETECT_ERROR_REG_NO_D3D_KEY;
+	}
+
+	// Find all subkeys
+
+	DWORD subKeyMaxLength = 0;
+
+	returnCode = ::RegQueryInfoKey(
+		dxKeyHandle,
+		nullptr,
+		nullptr,
+		nullptr,
+		&numOfAdapters,
+		&subKeyMaxLength,
+		nullptr,
+		nullptr,
+		nullptr,
+		nullptr,
+		nullptr,
+		nullptr
+	);
+
+	if( returnCode != ERROR_SUCCESS )
+	{
+		return GPUDETECT_ERROR_REG_GENERAL_FAILURE;
+	}
+
+	subKeyMaxLength += 1; // include the null character
+
+	uint64_t driverVersionRaw = 0;
+
+	bool foundSubkey = false;
+	TCHAR* subKeyName = new TCHAR[subKeyMaxLength];
+
+	for( DWORD i = 0; i < numOfAdapters; ++i )
+	{
+		DWORD subKeyLength = subKeyMaxLength;
+
+		returnCode = ::RegEnumKeyEx(
+			dxKeyHandle,
+			i,
+			subKeyName,
+			&subKeyLength,
+			nullptr,
+			nullptr,
+			nullptr,
+			nullptr
+		);
+
+		if( returnCode == ERROR_SUCCESS )
+		{
+			LUID adapterLUID = {};
+			DWORD qwordSize = sizeof( uint64_t );
+
+			returnCode = ::RegGetValue(
+				dxKeyHandle,
+				subKeyName,
+				_T("AdapterLuid"),
+				RRF_RT_QWORD,
+				nullptr,
+				&adapterLUID,
+				&qwordSize
+			);
+
+			if( returnCode == ERROR_SUCCESS // If we were able to retrieve the registry values
+				&& adapterLUID.HighPart == gpuData->adapterLUID.HighPart && adapterLUID.LowPart == gpuData->adapterLUID.LowPart ) // and if the vendor ID and device ID match
+			{
+				// We have our registry key! Let's get the driver version num now
+
+				returnCode = ::RegGetValue(
+					dxKeyHandle,
+					subKeyName,
+					_T("DriverVersion"),
+					RRF_RT_QWORD,
+					nullptr,
+					&driverVersionRaw,
+					&qwordSize
+				);
+
+				if( returnCode == ERROR_SUCCESS )
+				{
+					foundSubkey = true;
+					break;
+				}
+			}
+		}
+	}
+
+	returnCode = ::RegCloseKey( dxKeyHandle );
+	assert( returnCode == ERROR_SUCCESS );
+	delete[] subKeyName;
+
+	if( !foundSubkey )
+	{
+		return GPUDETECT_ERROR_REG_MISSING_DRIVER_INFO;
+	}
+
+	// Now that we have our driver version as a DWORD, let's process that into something readable
+	gpuData->dxDriverVersion[ 0 ] = (unsigned int) ( ( driverVersionRaw & 0xFFFF000000000000 ) >> 16 * 3 );
+	gpuData->dxDriverVersion[ 1 ] = (unsigned int) ( ( driverVersionRaw & 0x0000FFFF00000000 ) >> 16 * 2 );
+	gpuData->dxDriverVersion[ 2 ] = (unsigned int) ( ( driverVersionRaw & 0x00000000FFFF0000 ) >> 16 * 1 );
+	gpuData->dxDriverVersion[ 3 ] = (unsigned int) ( ( driverVersionRaw & 0x000000000000FFFF ) );
+
+	gpuData->driverInfo.driverReleaseRevision = gpuData->dxDriverVersion[2];
+	gpuData->driverInfo.driverBuildNumber = gpuData->dxDriverVersion[3];
+
+	gpuData->d3dRegistryDataAvailability = true;
+
+	return EXIT_SUCCESS;
+}
+
+void GetDriverVersionAsCString( const GPUData* const gpuData, char* const outBuffer, size_t outBufferSize )
+{
+	// let's assume 4 digits max per segment
+	const size_t kMaxBufferSize = (4 * 4) + 3;
+	if( gpuData != nullptr && outBuffer != nullptr && outBufferSize <= kMaxBufferSize)
+	{
+		sprintf_s( outBuffer, outBufferSize, "%u.%u.%u.%u", gpuData->dxDriverVersion[ 0 ], gpuData->dxDriverVersion[ 1 ], gpuData->dxDriverVersion[ 2 ], gpuData->dxDriverVersion[ 3 ] );
+	}
+}
+
+GPUDetect::IntelGraphicsGeneration GetIntelGraphicsGeneration( INTEL_GPU_ARCHITECTURE architecture )
+{
+	switch( architecture )
+	{
+		case IGFX_SANDYBRIDGE:
+			return INTEL_GFX_GEN6;
+
+		case IGFX_IVYBRIDGE:
+		case IGFX_VALLEYVIEW:
+			return INTEL_GFX_GEN7;
+
+		case IGFX_HASWELL:
+			return INTEL_GFX_GEN7_5;
+
+		case IGFX_BROADWELL:
+		case IGFX_CHERRYVIEW:
+			return INTEL_GFX_GEN8;
+
+		case IGFX_SKYLAKE:
+			return INTEL_GFX_GEN9;
+
+		case IGFX_GEMINILAKE:
+		case IGFX_KABYLAKE:
+		case IGFX_WHISKEYLAKE:
+		case IGFX_COFFEELAKE:
+		case IGFX_COMETLAKE:
+			return INTEL_GFX_GEN9_5;
+
+		case IGFX_CANNONLAKE:
+			return INTEL_GFX_GEN10;
+
+		case IGFX_LAKEFIELD:
+		case IGFX_ICELAKE:
+		case IGFX_ICELAKE_LP:
+			return INTEL_GFX_GEN11;
+
+		case IGFX_TIGERLAKE_LP:
+		case IGFX_DG1:
+		case IGFX_ROCKETLAKE:
+			return INTEL_GFX_GEN12;
+
+
+		default:
+			return INTEL_GFX_GEN_UNKNOWN;
+	}
+}
+
+const char * GetIntelGraphicsGenerationString( const IntelGraphicsGeneration generation)
+{
+	switch( generation )
+	{
+		case INTEL_GFX_GEN6:   return "Gen6";
+		case INTEL_GFX_GEN7:   return "Gen7";
+		case INTEL_GFX_GEN7_5: return "Gen7.5";
+		case INTEL_GFX_GEN8:   return "Gen8";
+		case INTEL_GFX_GEN9:   return "Gen9";
+		case INTEL_GFX_GEN9_5: return "Gen9.5";
+		case INTEL_GFX_GEN10:  return "Gen10";
+		case INTEL_GFX_GEN11:  return "Gen11";
+		case INTEL_GFX_GEN12:  return "Gen12 / Xe";
+
+		case INTEL_GFX_GEN_UNKNOWN:
+		default:               return "Unkown";
+	}
+}
+
+int InitAdapter( IDXGIAdapter** adapter, int adapterIndex )
+{
+	if( adapter == nullptr || adapterIndex < 0 )
+	{
+		return GPUDETECT_ERROR_BAD_DATA;
+	}
+
+	//
+	// We are relying on DXGI (supported on Windows Vista and later) to query
+	// the adapter, so fail if it is not available.
+	//
+	// DXGIFactory1 is required by Windows Store Apps so try that first.
+	//
+	const HMODULE hDXGI = ::LoadLibrary( _T("dxgi.dll") );
+	if( hDXGI == nullptr )
+	{
+		return GPUDETECT_ERROR_DXGI_LOAD;
+	}
+
+	typedef HRESULT( WINAPI*LPCREATEDXGIFACTORY )( REFIID riid, void** ppFactory );
+
+	LPCREATEDXGIFACTORY pCreateDXGIFactory = (LPCREATEDXGIFACTORY) ::GetProcAddress( hDXGI, "CreateDXGIFactory1" );
+	if( pCreateDXGIFactory == nullptr )
+	{
+		pCreateDXGIFactory = (LPCREATEDXGIFACTORY) ::GetProcAddress( hDXGI, "CreateDXGIFactory" );
+		if( pCreateDXGIFactory == nullptr )
+		{
+			::FreeLibrary( hDXGI );
+			return GPUDETECT_ERROR_DXGI_FACTORY_CREATION;
+		}
+	}
+
+	//
+	// We have the CreateDXGIFactory function so use it to actually create the factory and enumerate
+	// through the adapters. Here, we are specifically looking for the Intel gfx adapter.
+	//
+	IDXGIFactory* pFactory = nullptr;
+	if( FAILED( pCreateDXGIFactory( __uuidof( IDXGIFactory ), (void**) ( &pFactory ) ) ) )
+	{
+		::FreeLibrary( hDXGI );
+		return GPUDETECT_ERROR_DXGI_FACTORY_CREATION;
+	}
+
+	if( FAILED( pFactory->EnumAdapters( adapterIndex, (IDXGIAdapter**) adapter ) ) )
+	{
+		pFactory->Release();
+		::FreeLibrary( hDXGI );
+		return GPUDETECT_ERROR_DXGI_ADAPTER_CREATION;
+	}
+
+	pFactory->Release();
+	::FreeLibrary( hDXGI );
+	return EXIT_SUCCESS;
+}
+
+int InitDevice( IDXGIAdapter* adapter, ID3D11Device** device )
+{
+	if ( device == nullptr )
+	{
+		return GPUDETECT_ERROR_BAD_DATA;
+	}
+
+	if( FAILED( ::D3D11CreateDevice( adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr, 0, nullptr, 0, D3D11_SDK_VERSION, device, nullptr, nullptr ) ) )
+	{
+		return GPUDETECT_ERROR_DXGI_DEVICE_CREATION;
+	}
+
+	return EXIT_SUCCESS;
+}
+
+int GetIntelDeviceInfo( IntelDeviceInfo2* deviceInfo, ID3D11Device* device )
+{
+	assert( deviceInfo != nullptr );
+	assert( device != nullptr );
+
+	//
+	// Grab the device context from the device.
+	//
+	ID3D11DeviceContext* deviceContext = nullptr;
+	device->GetImmediateContext( &deviceContext );
+
+	//
+	// Query the device to find the number of device dependent counters.
+	//
+	D3D11_COUNTER_INFO counterInfo = {};
+	device->CheckCounterInfo( &counterInfo );
+	if( counterInfo.LastDeviceDependentCounter == 0 )
+	{
+		deviceContext->Release();
+		return GPUDETECT_ERROR_DXGI_BAD_COUNTER;
+	}
+
+	//
+	// Search for the "Intel Device Information" counter and, if found, parse
+	// it's description to determine the supported version.
+	//
+	D3D11_COUNTER_DESC counterDesc = {};
+	int intelDeviceInfoVersion = 0;
+	bool intelDeviceInfo = false;
+
+	for( int i = D3D11_COUNTER_DEVICE_DEPENDENT_0; i <= counterInfo.LastDeviceDependentCounter; ++i )
+	{
+		counterDesc.Counter = static_cast<D3D11_COUNTER>( i );
+
+		D3D11_COUNTER_TYPE counterType = {};
+		UINT uiSlotsRequired = 0;
+		UINT uiNameLength = 0;
+		UINT uiUnitsLength = 0;
+		UINT uiDescLength = 0;
+
+		if( FAILED( device->CheckCounter( &counterDesc, &counterType, &uiSlotsRequired, nullptr, &uiNameLength, nullptr, &uiUnitsLength, nullptr, &uiDescLength ) ) )
+		{
+			continue;
+		}
+
+		LPSTR sName = new char[ uiNameLength ];
+		LPSTR sUnits = new char[ uiUnitsLength ];
+		LPSTR sDesc = new char[ uiDescLength ];
+
+		intelDeviceInfo =
+			SUCCEEDED( device->CheckCounter( &counterDesc, &counterType, &uiSlotsRequired, sName, &uiNameLength, sUnits, &uiUnitsLength, sDesc, &uiDescLength ) ) &&
+			( strcmp( sName, "Intel Device Information" ) == 0 );
+
+		if( intelDeviceInfo )
+		{
+			sscanf_s( sDesc, "Version %d", &intelDeviceInfoVersion );
+		}
+
+		delete[] sName;
+		delete[] sUnits;
+		delete[] sDesc;
+
+		if( intelDeviceInfo )
+		{
+			break;
+		}
+	}
+
+	//
+	// Create the information counter, and query it to get the data. GetData()
+	// returns a pointer to the data, not the actual data.
+	//
+	ID3D11Counter* counter = nullptr;
+	if( !intelDeviceInfo || FAILED( device->CreateCounter( &counterDesc, &counter ) ) )
+	{
+		deviceContext->Release();
+		return GPUDETECT_ERROR_DXGI_COUNTER_CREATION;
+	}
+
+	deviceContext->Begin( counter );
+	deviceContext->End( counter );
+
+	uintptr_t dataAddress = 0;
+	if( deviceContext->GetData( counter, reinterpret_cast<void*>(&dataAddress), sizeof( dataAddress ), 0 ) != S_OK )
+	{
+		counter->Release();
+		deviceContext->Release();
+		return GPUDETECT_ERROR_DXGI_COUNTER_GET_DATA;
+	}
+
+	//
+	// Copy the information into the user's structure
+	//
+	assert( intelDeviceInfoVersion == 1 || intelDeviceInfoVersion == 2 );
+	const size_t infoSize = intelDeviceInfoVersion == 1
+		? sizeof( IntelDeviceInfo1 )
+		: sizeof( IntelDeviceInfo2 );
+	assert( infoSize <= sizeof( *deviceInfo ) );
+	memset( deviceInfo, 0, sizeof( *deviceInfo ) );
+	memcpy( deviceInfo, reinterpret_cast<const void*>( dataAddress ), infoSize );
+
+	counter->Release();
+	deviceContext->Release();
+	return EXIT_SUCCESS;
+}
+
+}
diff --git a/IHVs/gpudetect/GPUDetect.h b/IHVs/gpudetect/GPUDetect.h
new file mode 100644
index 0000000..8ddf432
--- /dev/null
+++ b/IHVs/gpudetect/GPUDetect.h
@@ -0,0 +1,556 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright 2017-2020 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+////////////////////////////////////////////////////////////////////////////////
+
+
+#pragma once
+
+#include <stdint.h>
+
+#include "DeviceId.h"
+
+
+// forward decls
+struct IDXGIAdapter;
+struct ID3D11Device;
+
+
+// Error return codes for GPUDetect
+// These codes are set up so that (ERROR_CODE % GENERAL_ERROR_CODE) == 0 if
+// ERROR_CODE is a subset of GENERAL_ERROR_CODE.
+// e.g. GPUDETECT_ERROR_DXGI_LOAD % GPUDETECT_ERROR_DXGI_LOAD == 0
+#define GPUDETECT_ERROR_GENERIC                 1
+
+/// General DXGI Errors
+#define GPUDETECT_ERROR_GENERAL_DXGI            2
+#define GPUDETECT_ERROR_DXGI_LOAD               GPUDETECT_ERROR_GENERAL_DXGI * 3
+#define GPUDETECT_ERROR_DXGI_ADAPTER_CREATION   GPUDETECT_ERROR_GENERAL_DXGI * 5
+#define GPUDETECT_ERROR_DXGI_FACTORY_CREATION   GPUDETECT_ERROR_GENERAL_DXGI * 7
+#define GPUDETECT_ERROR_DXGI_DEVICE_CREATION    GPUDETECT_ERROR_GENERAL_DXGI * 11
+#define GPUDETECT_ERROR_DXGI_GET_ADAPTER_DESC   GPUDETECT_ERROR_GENERAL_DXGI * 13
+
+/// DXGI Counter Errors
+#define GPUDETECT_ERROR_GENERAL_DXGI_COUNTER    17
+#define GPUDETECT_ERROR_DXGI_BAD_COUNTER        GPUDETECT_ERROR_GENERAL_DXGI_COUNTER * 19
+#define GPUDETECT_ERROR_DXGI_COUNTER_CREATION   GPUDETECT_ERROR_GENERAL_DXGI_COUNTER * 23
+#define GPUDETECT_ERROR_DXGI_COUNTER_GET_DATA   GPUDETECT_ERROR_GENERAL_DXGI_COUNTER * 29
+
+/// Windows Registry Errors
+#define GPUDETECT_ERROR_REG_GENERAL_FAILURE     31
+#define GPUDETECT_ERROR_REG_NO_D3D_KEY          GPUDETECT_ERROR_REG_GENERAL_FAILURE * 37 // A DirectX key was not found in the registry in the expected location
+#define GPUDETECT_ERROR_REG_MISSING_DRIVER_INFO GPUDETECT_ERROR_REG_GENERAL_FAILURE * 41 // Driver info is missing from the registry
+
+/// Precondition Errors
+#define GPUDETECT_ERROR_BAD_DATA                47
+
+#define GPUDETECT_ERROR_NOT_SUPPORTED           55
+
+
+namespace GPUDetect
+{
+	enum
+	{
+		INTEL_VENDOR_ID = 0x8086,
+	};
+
+	// Define settings to reflect Fidelity abstraction levels you need
+	enum PresetLevel
+	{
+		NotCompatible,  // Found GPU is not compatible with the app
+		Low,
+		Medium,
+		MediumPlus,
+		High,
+		Undefined  // No predefined setting found in cfg file.
+				   // Use a default level for unknown video cards.
+	};
+
+	// An enum that identifies the generation of Graphics
+	enum IntelGraphicsGeneration
+	{
+		INTEL_GFX_GEN_UNKNOWN = 0,
+		INTEL_GFX_GEN6,
+		INTEL_GFX_GEN7,
+		INTEL_GFX_GEN7_5,
+		INTEL_GFX_GEN8,
+		INTEL_GFX_GEN9,
+		INTEL_GFX_GEN9_5,
+		INTEL_GFX_GEN10,
+		INTEL_GFX_GEN11,
+		INTEL_GFX_GEN12,
+	};
+
+	struct GPUData
+	{
+		/////////////////////////
+		// DX11 Extension Data //
+		/////////////////////////
+
+		/*******************************************************************************
+		 * dxAdapterAvailability
+		 *
+		 *     Is true if Intel driver extension data is populated.
+		 *     If this value is false, all other extension data will be null.
+		 *
+		 *     This value is initialized by the InitExtensionInfo function.
+		 *
+		 ******************************************************************************/
+		bool dxAdapterAvailability;
+
+		/*******************************************************************************
+		 * vendorID
+		 *
+		 *     The vendorID of the GPU.
+		 *
+		 *     This value is initialized by the InitExtensionInfo function.
+		 *
+		 ******************************************************************************/
+		unsigned int vendorID;
+
+		/*******************************************************************************
+		 * deviceID
+		 *
+		 *     The DeviceID of the GPU.
+		 *
+		 *     This value is initialized by the InitExtensionInfo function.
+		 *
+		 ******************************************************************************/
+		unsigned int deviceID;
+
+		/*******************************************************************************
+		 * adapterLUID
+		 *
+		 *     The LUID of the d3d adapter.
+		 *
+		 *     This value is initialized by the InitExtensionInfo function.
+		 *
+		 ******************************************************************************/
+		LUID adapterLUID;
+
+		/*******************************************************************************
+		* architectureCounter
+		*
+		*     The architecture of the GPU.
+		*
+		*     This value is initialized by the InitExtensionInfo function.
+		*
+		******************************************************************************/
+		INTEL_GPU_ARCHITECTURE architecture;
+
+		/*******************************************************************************
+		 * isUMAArchitecture
+		 *
+		 *     Is true if the GPU uses a uniform memory access architecture.
+		 *     On GPUs with a Unified Memory Architecture (UMA) like Intel integrated
+		 *     GPUs, the CPU system memory is also used for graphics and there is no
+		 *     dedicated VRAM.  Any memory reported as "dedicated" is really a small
+		 *     pool of system memory reserved by the BIOS for internal use. All normal
+		 *     application allocations (buffers, textures, etc.) are allocated from
+		 *     general system "shared" memory.  For this reason, do not use the
+		 *     dedicated memory size as an indication of UMA GPU capability (either
+		 *     performance, nor memory capacity).
+		 *
+		 *     This value is initialized by the InitExtensionInfo function.
+		 *
+		 ******************************************************************************/
+		bool isUMAArchitecture;
+
+		/*******************************************************************************
+		 * videoMemory
+		 *
+		 *     The amount of Video memory in bytes.
+		 *
+		 *     This value is initialized by the InitExtensionInfo function.
+		 *
+		 ******************************************************************************/
+		uint64_t videoMemory;
+
+		/*******************************************************************************
+		 * description
+		 *
+		 *     The driver-provided description of the GPU.
+		 *
+		 *     This value is initialized by the InitExtensionInfo function.
+		 *
+		 ******************************************************************************/
+		WCHAR description[ _countof( DXGI_ADAPTER_DESC::Description ) ];
+
+		/*******************************************************************************
+		 * extensionVersion
+		 *
+		 *     Version number for D3D driver extensions.
+		 *
+		 *     This value is initialized by the InitExtensionInfo function.
+		 *
+		 ******************************************************************************/
+		unsigned int extensionVersion;
+
+		/*******************************************************************************
+		 * intelExtensionAvailability
+		 *
+		 *     True if Intel driver extensions are available on the GPU.
+		 *
+		 *     This value is initialized by the InitExtensionInfo function.
+		 *
+		 ******************************************************************************/
+		bool intelExtensionAvailability;
+
+		/////////////////////////////////
+		// DX11 Hardware Counters Data //
+		/////////////////////////////////
+
+		/*******************************************************************************
+		 * counterAvailability
+		 *
+		 *     Returns true if Intel driver extensions are available to gather data from.
+		 *     If this value is false, all other extension data will be null.
+		 *
+		 *     This value is initialized by the InitCounterInfo function.
+		 *
+		 ******************************************************************************/
+		bool counterAvailability;
+
+		/*******************************************************************************
+		 * maxFrequency
+		 *
+		 *     Returns the maximum frequency of the GPU in MHz.
+		 *
+		 *     This value is initialized by the InitCounterInfo function.
+		 *
+		 ******************************************************************************/
+		unsigned int maxFrequency;
+
+		/*******************************************************************************
+		 * minFrequency
+		 *
+		 *     Returns the minimum frequency of the GPU in MHz.
+		 *
+		 *     This value is initialized by the InitCounterInfo function.
+		 *
+		 ******************************************************************************/
+		unsigned int minFrequency;
+
+		/// Advanced counter info
+
+		/*******************************************************************************
+		 * advancedCounterDataAvailability
+		 *
+		 *     Returns true if advanced counter data is available from this GPU.
+		 *     Older Intel products only provide the maximum and minimum GPU frequency
+		 *     via the hardware counters.
+		 *
+		 *     This value is initialized by the InitCounterInfo function.
+		 *
+		 ******************************************************************************/
+		bool advancedCounterDataAvailability;
+
+		/*******************************************************************************
+		 * euCount
+		 *
+		 *     Returns the number of execution units (EUs) on the GPU.
+		 *
+		 *     This value is initialized by the InitCounterInfo function.
+		 *
+		 ******************************************************************************/
+		unsigned int euCount;
+
+		/*******************************************************************************
+		 * packageTDP
+		 *
+		 *     Returns the thermal design power (TDP) of the GPU in watts.
+		 *
+		 *     This value is initialized by the InitCounterInfo function.
+		 *
+		 ******************************************************************************/
+		unsigned int packageTDP;
+
+		/*******************************************************************************
+		 * maxFillRate
+		 *
+		 *     Returns the maximum fill rate of the GPU in pixels/clock.
+		 *
+		 *     This value is initialized by the InitCounterInfo function.
+		 *
+		 ******************************************************************************/
+		unsigned int maxFillRate;
+
+		///////////////////////
+		// D3D Registry Data //
+		///////////////////////
+
+		/*******************************************************************************
+		* dxDriverVersion
+		*
+		*     The version number for the adapter's driver. This is stored in a 4 part
+		*     version number that should be displayed in the format: "0.1.2.4"
+		*
+		*     This value is initialized by the InitDxDriverVersion function.
+		*
+		******************************************************************************/
+		unsigned int dxDriverVersion[ 4 ];
+
+		/*******************************************************************************
+		 * d3dRegistryDataAvailability
+		 *
+		 *     Is true if d3d registry data is populated. If this value is true and
+		 *     vendorID == INTEL_VENDOR_ID, then the driverInfo and dxDriverVersion 
+		 *     fields will be populated. If this value is false, all other registry data
+		 *     will be null.
+		 *
+		 *     This value is initialized by the InitDxDriverVersion function.
+		 *
+		 ******************************************************************************/
+		bool d3dRegistryDataAvailability;
+
+		struct DriverVersionInfo
+		{
+			/*******************************************************************************
+			 * driverReleaseRevision
+			 *
+			 *     The release revision for this device's driver. This is the third
+			 *     section of the driver version number as illustrated by the 'X's below:
+			 *     00.00.XXX.0000
+			 *
+			 *     This value is initialized by the InitDxDriverVersion function.
+			 *
+			 ******************************************************************************/
+			unsigned int driverReleaseRevision;
+
+			/*******************************************************************************
+			 * buildNumber
+			 *
+			 *     The build number for this device's driver. This is the last
+			 *     section of the driver version number as shown below:
+			 *     00.00.000.XXXX
+			 *
+			 *     For example, for the driver version 12.34.56.7890, buildNumber
+			 *     would be 7890.
+			 *
+			 *     This value is initialized by the InitDxDriverVersion function.
+			 *
+			 ******************************************************************************/
+			unsigned int driverBuildNumber;
+		} driverInfo;
+	};
+
+	/*******************************************************************************
+	 * InitAll
+	 *
+	 *     Loads all available info from this GPUDetect into gpuData. Returns
+	 *     EXIT_SUCCESS if no error was encountered, otherwise returns an error code.
+	 *
+	 *     gpuData
+	 *         The struct in which the information will be stored.
+	 *
+	 *     adapterIndex
+	 *         The index of the adapter to get the information from.
+	 *
+	 ******************************************************************************/
+	int InitAll( GPUData* const gpuData, int adapterIndex );
+
+	/*******************************************************************************
+	 * InitAll
+	 *
+	 *     Loads all available info from this GPUDetect into gpuData. Returns
+	 *     EXIT_SUCCESS if no error was encountered, otherwise returns an error code.
+	 *
+	 *     gpuData
+	 *         The struct in which the information will be stored.
+	 *
+	 *     adapter
+	 *         A pointer to the adapter to draw info from.
+	 *
+	 *	   device
+	 *         A pointer to the device to draw info from.
+	 *
+	 ******************************************************************************/
+	int InitAll( GPUData* const gpuData, IDXGIAdapter* adapter, ID3D11Device* device );
+
+	/*******************************************************************************
+	 * InitExtensionInfo
+	 *
+	 *     Loads available info from the DX11 extension interface. Returns
+	 *     EXIT_SUCCESS if no error was encountered, otherwise returns an error code.
+	 *
+	 *     gpuData
+	 *         The struct in which the information will be stored.
+	 *
+	 *     adapterIndex
+	 *         The index of the adapter to get the information from.
+	 *
+	 ******************************************************************************/
+	int InitExtensionInfo( GPUData* const gpuData, int adapterIndex );
+
+	/*******************************************************************************
+	 * InitExtensionInfo
+	 *
+	 *     Loads available info from the DX11 extension interface. Returns
+	 *     EXIT_SUCCESS if no error was encountered, otherwise returns an error code.
+	 *
+	 *     gpuData
+	 *         The struct in which the information will be stored.
+	 *
+	 *     adapter
+	 *         A pointer to the adapter to draw info from.
+	 *
+	 *	   device
+	 *         A pointer to the device to draw info from.
+	 *
+	 ******************************************************************************/
+	int InitExtensionInfo( GPUData* const gpuData, IDXGIAdapter* adapter, ID3D11Device* device );
+
+	/*******************************************************************************
+	 * InitCounterInfo
+	 *
+	 *     Loads available info from DX11 hardware counters. Returns EXIT_SUCCESS
+	 *     if no error was encountered, otherwise returns an error code. Requires
+	 *     that InitExtensionInfo be run on gpuData before this is called.
+	 *
+	 *     gpuData
+	 *         The struct in which the information will be stored.
+	 *
+	 *     adapterIndex
+	 *         The index of the adapter to get the information from.
+	 *
+	 ******************************************************************************/
+	int InitCounterInfo( GPUData* const gpuData, int adapterIndex );
+
+	/*******************************************************************************
+	 * InitCounterInfo
+	 *
+	 *     Intel exposes additional information through the DX driver
+	 *     that can be obtained querying a special counter. This loads the
+	 *     available info. It returns EXIT_SUCCESS if no error was encountered,
+	 *     otherwise returns an error code.
+	 *
+	 *      Requires that InitExtensionInfo be run on gpuData before this is called.
+	 *
+	 *     gpuData
+	 *         The struct in which the information will be stored.
+	 *
+	 *	   device
+	 *         A pointer to the device to draw info from.
+	 *
+	 ******************************************************************************/
+	int InitCounterInfo( GPUData* const gpuData, ID3D11Device* device );
+
+	/*******************************************************************************
+	 * GetDefaultFidelityPreset
+	 *
+	 *     Function to find the default fidelity preset level, based on the type of
+	 *     graphics adapter present.
+	 *
+	 *     The guidelines for graphics preset levels for Intel devices is a generic
+	 *     one based on our observations with various contemporary games. You would
+	 *     have to change it if your game already plays well on the older hardware
+	 *     even at high settings.
+	 *
+	 *     Presets for Intel are expected in a file named "IntelGFX.cfg". This
+	 *     method can also be easily modified to also read similar .cfg files
+	 *     detailing presets for other manufacturers.
+	 *
+	 *     gpuData
+	 *         The data for the GPU in question.
+	 *
+	 ******************************************************************************/
+	PresetLevel GetDefaultFidelityPreset( const GPUData* const gpuData );
+
+	/*******************************************************************************
+	 * InitDxDriverVersion
+	 *
+	 *     Loads the DX driver version for the given adapter from the windows
+	 *     registry. Returns EXIT_SUCCESS if no error was encountered, otherwise
+	 *     returns an error code. Requires that InitExtensionInfo be run on gpuData
+	 *     before this is called.
+	 *
+	 *     gpuData
+	 *         The struct in which the information will be stored.
+	 *
+	 ******************************************************************************/
+	int InitDxDriverVersion( GPUData* const gpuData );
+
+	/*******************************************************************************
+	 * GetDriverVersionAsCString
+	 *
+	 *     Stores the driver version as a string in the 00.00.000.0000 format.
+	 *
+	 *     gpuData
+	 *         The struct that contains the driver version.
+	 *
+	 *     outBuffer
+	 *         Buffer to store the resulting c string.
+	 *
+	 *     outBufferSize
+	 *         Size of buffer to store the resulting c string.
+	 *
+	 ******************************************************************************/
+	void GetDriverVersionAsCString( const GPUData* const gpuData, char* const outBuffer, size_t outBufferSize );
+
+	/*******************************************************************************
+	 * GetIntelGraphicsGeneration
+	 *
+	 *     Returns the generation of Intel(tm) Graphics, given the architecture.
+	 *
+	 *     architecture
+	 *         The architecture to identify.
+	 *
+	 ******************************************************************************/
+	IntelGraphicsGeneration GetIntelGraphicsGeneration( INTEL_GPU_ARCHITECTURE architecture );
+
+	/*******************************************************************************
+	 * GetIntelGraphicsGenerationString
+	 *
+	 *     Returns the generation of Intel(tm) Graphics, given the architecture.
+	 *
+	 *     generation
+	 *         The generation to identify.
+	 *
+	 ******************************************************************************/
+	const char * GetIntelGraphicsGenerationString( const IntelGraphicsGeneration genneration );
+
+	/*******************************************************************************
+	 * InitAdapter
+	 *
+	 *     Initializes a adapter of the given index. Returns EXIT_SUCCESS if no
+	 *     error was encountered, otherwise returns an error code.
+	 *
+	 *     adapter
+	 *         The address of the pointer that this function will point to
+	 *         the created adapter.
+	 *
+	 *     adapterIndex
+	 *         If adapterIndex >= 0 this will be used as as the index of the
+	 *         adapter to create.
+	 *
+	 ******************************************************************************/
+	int InitAdapter( IDXGIAdapter** adapter, int adapterIndex );
+
+	/*******************************************************************************
+	 * InitDevice
+	 *
+	 *     Initializes a DX11 device of the given index. Returns EXIT_SUCCESS if no
+	 *     error was encountered, otherwise returns an error code.
+	 *
+	 *     adapter
+	 *         The adapter to create the device from.
+	 *
+	 *     device
+	 *         The address of the pointer that this function will point to the
+	 *         created device.
+	 *
+	 ******************************************************************************/
+	int InitDevice( IDXGIAdapter* adapter, ID3D11Device** device );
+
+}
diff --git a/IHVs/gpudetect/GPUDetect.sln b/IHVs/gpudetect/GPUDetect.sln
new file mode 100644
index 0000000..96335a2
--- /dev/null
+++ b/IHVs/gpudetect/GPUDetect.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2046
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPUDetect", "GPUDetect.vcxproj", "{D10D10ED-77A8-4A00-8ACA-5A091BE96497}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D10D10ED-77A8-4A00-8ACA-5A091BE96497}.Debug|x64.ActiveCfg = Debug|x64
+		{D10D10ED-77A8-4A00-8ACA-5A091BE96497}.Debug|x64.Build.0 = Debug|x64
+		{D10D10ED-77A8-4A00-8ACA-5A091BE96497}.Debug|x86.ActiveCfg = Debug|Win32
+		{D10D10ED-77A8-4A00-8ACA-5A091BE96497}.Debug|x86.Build.0 = Debug|Win32
+		{D10D10ED-77A8-4A00-8ACA-5A091BE96497}.Release|x64.ActiveCfg = Release|x64
+		{D10D10ED-77A8-4A00-8ACA-5A091BE96497}.Release|x64.Build.0 = Release|x64
+		{D10D10ED-77A8-4A00-8ACA-5A091BE96497}.Release|x86.ActiveCfg = Release|Win32
+		{D10D10ED-77A8-4A00-8ACA-5A091BE96497}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {940D28D5-4CD9-48E3-A052-F6ADA689D3E5}
+	EndGlobalSection
+EndGlobal
diff --git a/IHVs/gpudetect/GPUDetect.vcxproj b/IHVs/gpudetect/GPUDetect.vcxproj
new file mode 100644
index 0000000..7b33649
--- /dev/null
+++ b/IHVs/gpudetect/GPUDetect.vcxproj
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{D10D10ED-77A8-4A00-8ACA-5A091BE96497}</ProjectGuid>
+    <RootNamespace>GPUDetect</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>
+    </LinkIncremental>
+    <OutDir>$(SolutionDir)x64\$(Configuration)\Bin\</OutDir>
+    <TargetName>$(ProjectName)$(PlatformArchitecture)</TargetName>
+    <TargetExt>.lib</TargetExt>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>
+    </LinkIncremental>
+    <OutDir>$(SolutionDir)x64\$(Configuration)\Bin\</OutDir>
+    <TargetName>$(ProjectName)$(PlatformArchitecture)</TargetName>
+    <TargetExt>.lib</TargetExt>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>
+    </LinkIncremental>
+    <OutDir>$(SolutionDir)x64\$(Configuration)\Bin\</OutDir>
+    <TargetName>$(ProjectName)$(PlatformArchitecture)</TargetName>
+    <TargetExt>.lib</TargetExt>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>
+    </LinkIncremental>
+    <OutDir>$(SolutionDir)x64\$(Configuration)\Bin\</OutDir>
+    <TargetName>$(ProjectName)$(PlatformArchitecture)</TargetName>
+    <TargetExt>.lib</TargetExt>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <MinimalRebuild>false</MinimalRebuild>
+      <ExceptionHandling>false</ExceptionHandling>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>false</ConformanceMode>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions>_DEBUG;DEBUG;STRICT;NOMINMAX;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;_HAS_EXCEPTIONS=0;_HAS_ITERATOR_DEBUGGING=1;_ITERATOR_DEBUG_LEVEL=2;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy /y IntelGfx.cfg "$(OutDir)"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <MinimalRebuild>false</MinimalRebuild>
+      <ExceptionHandling>false</ExceptionHandling>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>false</ConformanceMode>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions>_DEBUG;DEBUG;STRICT;NOMINMAX;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;_HAS_EXCEPTIONS=0;_HAS_ITERATOR_DEBUGGING=1;_ITERATOR_DEBUG_LEVEL=2;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy /y IntelGfx.cfg "$(OutDir)"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <OmitFramePointers>true</OmitFramePointers>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>false</ExceptionHandling>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>false</ConformanceMode>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions>NDEBUG;STRICT;NOMINMAX;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;_NO_DEBUG_HEAP=1;_HAS_EXCEPTIONS=0;_HAS_ITERATOR_DEBUGGING=0;_ITERATOR_DEBUG_LEVEL=0;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
+      <AdditionalDependencies>d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy /y IntelGfx.cfg "$(OutDir)"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <OmitFramePointers>true</OmitFramePointers>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>false</ExceptionHandling>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>false</ConformanceMode>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions>NDEBUG;STRICT;NOMINMAX;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;_NO_DEBUG_HEAP=1;_HAS_EXCEPTIONS=0;_HAS_ITERATOR_DEBUGGING=0;_ITERATOR_DEBUG_LEVEL=0;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
+      <AdditionalDependencies>d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy /y IntelGfx.cfg "$(OutDir)"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="DeviceId.h" />
+    <ClInclude Include="GPUDetect.h" />
+    <ClInclude Include="ID3D10Extensions.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="IntelGfx.cfg" />
+    <None Include="readme.md" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="license.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="DeviceId.cpp" />
+    <ClCompile Include="GPUDetect.cpp" />
+    <ClCompile Include="TestMain.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/IHVs/gpudetect/ID3D10Extensions.h b/IHVs/gpudetect/ID3D10Extensions.h
new file mode 100644
index 0000000..db80b7a
--- /dev/null
+++ b/IHVs/gpudetect/ID3D10Extensions.h
@@ -0,0 +1,310 @@
+//--------------------------------------------------------------------------------------
+// Copyright 2011,2012,2013 Intel Corporation
+// All Rights Reserved
+//
+// Permission is granted to use, copy, distribute and prepare derivative works of this
+// software for any purpose and without fee, provided, that the above copyright notice
+// and this statement appear in all copies.  Intel makes no representations about the
+// suitability of this software for any purpose.  THIS SOFTWARE IS PROVIDED "AS IS."
+// INTEL SPECIFICALLY DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, AND ALL LIABILITY,
+// INCLUDING CONSEQUENTIAL AND OTHER INDIRECT DAMAGES, FOR THE USE OF THIS SOFTWARE,
+// INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PROPRIETARY RIGHTS, AND INCLUDING THE
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  Intel does not
+// assume any responsibility for any errors which may appear in this software nor any
+// responsibility to update it.
+//--------------------------------------------------------------------------------------
+#pragma once
+
+namespace ID3D10
+{
+
+	/*****************************************************************************\
+	CONST: EXTENSION_INTERFACE_VERSION
+	PURPOSE: Version of this header file
+	\*****************************************************************************/
+	const UINT EXTENSION_INTERFACE_VERSION_1_0 = 0x00010000;
+	const UINT EXTENSION_INTERFACE_VERSION = EXTENSION_INTERFACE_VERSION_1_0;
+
+	/*****************************************************************************\
+	CONST: CAPS_EXTENSION_KEY
+	PURPOSE: KEY to pass to UMD
+	\*****************************************************************************/
+	const char CAPS_EXTENSION_KEY[ 16 ] = {
+		'I','N','T','C',
+		'E','X','T','N',
+		'C','A','P','S',
+		'F','U','N','C' };
+
+	/*****************************************************************************\
+	TYPEDEF: PFND3D10UMDEXT_CHECKEXTENSIONSUPPORT
+	PURPOSE: Function pointer for shader flag extensions
+	\*****************************************************************************/
+	typedef BOOL( APIENTRY* PFND3D10UMDEXT_CHECKEXTENSIONSUPPORT )( UINT );
+
+	/*****************************************************************************\
+	STRUCT: EXTENSION_BASE
+	PURPOSE: Base data structure for extension initialization data
+	\*****************************************************************************/
+	struct EXTENSION_BASE
+	{
+		// Input:
+		char    Key[ 16 ];                // CAPS_EXTENSION_KEY
+		UINT    ApplicationVersion;     // EXTENSION_INTERFACE_VERSION
+	};
+
+	/*****************************************************************************\
+	STRUCT: CAPS_EXTENSION_1_0
+	PURPOSE: Caps data structure
+	\*****************************************************************************/
+	struct CAPS_EXTENSION_1_0 : EXTENSION_BASE
+	{
+		// Output:
+		UINT    DriverVersion;          // EXTENSION_INTERFACE_VERSION
+		UINT    DriverBuildNumber;      // BUILD_NUMBER
+	};
+
+	typedef CAPS_EXTENSION_1_0  CAPS_EXTENSION;
+
+#ifndef D3D10_UMD
+	/*****************************************************************************\
+	FUNCTION: GetExtensionCaps
+	PURPOSE: Gets extension caps table from Intel graphics driver
+	\*****************************************************************************/
+	inline HRESULT GetExtensionCaps(
+		ID3D11Device* pd3dDevice,
+		CAPS_EXTENSION* pCaps )
+	{
+		D3D11_BUFFER_DESC desc;
+		ZeroMemory( &desc, sizeof( desc ) );
+		desc.ByteWidth = sizeof( CAPS_EXTENSION );
+		desc.Usage = D3D11_USAGE_STAGING;
+		desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
+
+		D3D11_SUBRESOURCE_DATA initData;
+		initData.pSysMem = pCaps;
+		initData.SysMemPitch = sizeof( CAPS_EXTENSION );
+		initData.SysMemSlicePitch = 0;
+
+		ZeroMemory( pCaps, sizeof( CAPS_EXTENSION ) );
+		memcpy( pCaps->Key, CAPS_EXTENSION_KEY,
+				sizeof( pCaps->Key ) );
+		pCaps->ApplicationVersion = EXTENSION_INTERFACE_VERSION;
+
+		ID3D11Buffer* pBuffer = NULL;
+		HRESULT result = pd3dDevice->CreateBuffer(
+			&desc,
+			&initData,
+			&pBuffer );
+
+		if( pBuffer )
+			pBuffer->Release();
+
+		if( S_OK == result )
+		{
+			result = ( pCaps->ApplicationVersion <= pCaps->DriverVersion ) ? S_OK : S_FALSE;
+		}
+		return result;
+	};
+#endif
+
+	/*****************************************************************************\
+	CONST: RESOURCE_EXTENSION_KEY
+	PURPOSE: KEY to pass to UMD
+	\*****************************************************************************/
+	const char RESOURCE_EXTENSION_KEY[ 16 ] = {
+		'I','N','T','C',
+		'E','X','T','N',
+		'R','E','S','O',
+		'U','R','C','E' };
+
+	/*****************************************************************************\
+	ENUM: RESOURCE_EXTENSION_TYPE
+	PURPOSE: Enumeration of supported resource extensions
+	\*****************************************************************************/
+	enum RESOURCE_EXTENSION_TYPE
+	{
+		RESOURCE_EXTENSION_RESERVED = 0,
+
+		// Version 1_0
+		RESOURCE_EXTENSION_DIRECT_ACCESS = 1,
+	};
+
+	/*****************************************************************************\
+	ENUM: RESOURCE_EXTENSION_FLAGS
+	PURPOSE: Enumeration for extra information
+	\*****************************************************************************/
+	enum RESOURCE_EXTENSION_FLAGS
+	{
+		RESOURCE_EXTENSION_DIRECT_ACCESS_LINEAR_ALLOCATION = 0x1,
+	};
+
+	/*****************************************************************************\
+	STRUCT: RESOURCE_EXTENSION_1_0
+	PURPOSE: Resource extension interface structure
+	\*****************************************************************************/
+	struct RESOURCE_EXTENSION_1_0 : EXTENSION_BASE
+	{
+		// Input:
+
+		// Enumeration of the extension
+		UINT    Type;       // RESOURCE_EXTENSION_TYPE
+
+		// Extension data
+		UINT    Data[ 16 ];
+	};
+
+	typedef RESOURCE_EXTENSION_1_0  RESOURCE_EXTENSION;
+
+	/*****************************************************************************\
+	STRUCT: RESOURCE_DIRECT_ACCESS_MAP_DATA
+	PURPOSE: Direct Access Resource extension Map structure
+	\*****************************************************************************/
+	struct RESOURCE_DIRECT_ACCESS_MAP_DATA
+	{
+		void*   pBaseAddress;
+		UINT    XOffset;
+		UINT    YOffset;
+
+		UINT    TileFormat;
+		UINT    Pitch;
+		UINT    Size;
+	};
+
+#ifndef D3D10_UMD
+	/*****************************************************************************\
+	FUNCTION: SetResouceExtension
+	PURPOSE: Resource extension interface
+	\*****************************************************************************/
+	inline HRESULT SetResouceExtension(
+		ID3D11Device* pd3dDevice,
+		const RESOURCE_EXTENSION* pExtnDesc )
+	{
+		D3D11_BUFFER_DESC desc;
+		ZeroMemory( &desc, sizeof( desc ) );
+		desc.ByteWidth = sizeof( RESOURCE_EXTENSION );
+		desc.Usage = D3D11_USAGE_STAGING;
+		desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
+
+		D3D11_SUBRESOURCE_DATA initData;
+		ZeroMemory( &initData, sizeof( initData ) );
+		initData.pSysMem = pExtnDesc;
+		initData.SysMemPitch = sizeof( RESOURCE_EXTENSION );
+		initData.SysMemSlicePitch = 0;
+
+		ID3D11Buffer* pBuffer = NULL;
+		HRESULT result = pd3dDevice->CreateBuffer(
+			&desc,
+			&initData,
+			&pBuffer );
+
+		if( pBuffer )
+			pBuffer->Release();
+
+		return result;
+	}
+
+	/*****************************************************************************\
+	FUNCTION: SetDirectAccessResouceExtension
+	PURPOSE: Direct Access Resource extension interface
+	\*****************************************************************************/
+	inline HRESULT SetDirectAccessResouceExtension(
+		ID3D11Device* pd3dDevice,
+		const UINT flags )
+	{
+		RESOURCE_EXTENSION extnDesc;
+		ZeroMemory( &extnDesc, sizeof( extnDesc ) );
+		memcpy( &extnDesc.Key[ 0 ], RESOURCE_EXTENSION_KEY,
+				sizeof( extnDesc.Key ) );
+		extnDesc.ApplicationVersion = EXTENSION_INTERFACE_VERSION;
+		extnDesc.Type = RESOURCE_EXTENSION_DIRECT_ACCESS;
+		extnDesc.Data[ 0 ] = flags;
+
+		return SetResouceExtension( pd3dDevice, &extnDesc );
+	}
+#endif
+
+	/*****************************************************************************\
+	CONST: STATE_EXTENSION_KEY
+	PURPOSE: KEY to pass to UMD
+	\*****************************************************************************/
+	const char STATE_EXTENSION_KEY[ 16 ] = {
+		'I','N','T','C',
+		'E','X','T','N',
+		'S','T','A','T',
+		'E','O','B','J' };
+
+	/*****************************************************************************\
+	ENUM: STATE_EXTENSION_TYPE
+	PURPOSE: Enumeration of supported state extensions
+	\*****************************************************************************/
+	enum STATE_EXTENSION_TYPE
+	{
+		STATE_EXTENSION_RESERVED = 0,
+
+		// Version 1_0
+	};
+
+	/*****************************************************************************\
+	STRUCT: STATE_EXTENSION_1_0
+	PURPOSE: UMD extension interface structure
+	\*****************************************************************************/
+	struct STATE_EXTENSION_1_0 : EXTENSION_BASE
+	{
+		// Input:
+
+		// Enumeration of the extension
+		UINT    Type;       // STATE_EXTENSION_TYPE
+
+		// Extension data
+		UINT    Data[ 16 ];
+	};
+
+	typedef STATE_EXTENSION_1_0 STATE_EXTENSION;
+
+#ifndef D3D10_UMD
+	/*****************************************************************************\
+	FUNCTION: SetStateExtension
+	PURPOSE: State extension interface
+	\*****************************************************************************/
+	inline HRESULT SetStateExtension(
+		ID3D11Device* pd3dDevice,
+		const STATE_EXTENSION* pExtnDesc )
+	{
+		D3D11_BUFFER_DESC desc;
+		ZeroMemory( &desc, sizeof( desc ) );
+		desc.ByteWidth = sizeof( STATE_EXTENSION );
+		desc.Usage = D3D11_USAGE_STAGING;
+		desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
+
+		D3D11_SUBRESOURCE_DATA initData;
+		ZeroMemory( &initData, sizeof( initData ) );
+		initData.pSysMem = pExtnDesc;
+		initData.SysMemPitch = sizeof( STATE_EXTENSION );
+		initData.SysMemSlicePitch = 0;
+
+		ID3D11Buffer* pBuffer = NULL;
+		HRESULT result = pd3dDevice->CreateBuffer(
+			&desc,
+			&initData,
+			&pBuffer );
+
+		if( pBuffer )
+			pBuffer->Release();
+
+		return result;
+	}
+#endif
+
+	/*****************************************************************************\
+	ENUM: SHADER_EXTENSION_TYPE
+	PURPOSE: Enumeration of supported shader extensions
+	\*****************************************************************************/
+	enum SHADER_EXTENSION_TYPE
+	{
+		SHADER_EXTENSION_RESERVED = 0,
+
+		// Version 1_0
+		SHADER_EXTENSION_PIXEL_SHADER_ORDERING = 1,
+	};
+
+} // namespace ID3D10
diff --git a/gpudetect/IntelGfx.cfg b/IHVs/gpudetect/IntelGfx.cfg
similarity index 58%
rename from gpudetect/IntelGfx.cfg
rename to IHVs/gpudetect/IntelGfx.cfg
index 66e8578..9714d65 100644
--- a/gpudetect/IntelGfx.cfg
+++ b/IHVs/gpudetect/IntelGfx.cfg
@@ -1,7 +1,7 @@
 ;
 ; Intel Graphics Preset Levels
 ;
-; Format: 
+; Format:
 ; VendorIDHex, DeviceIDHex, Example Out of the Box Settings; Commented name of cards
 ;
 
@@ -93,7 +93,16 @@
 0x8086,	0x0D1E, Low; Intel(R) HD Graphics
 0x8086,	0x0D2E, Low; Intel(R) Iris(TM) Pro Graphics 5200
 
+; Valleyview
+0x8086, 0x0F30, Low; Intel(R) Vallyview Graphics
+0x8086, 0x0F31, Low; Intel(R) Vallyview Graphics
+
 ; Broadwell
+0x8086, 0x0BD0, Low; Intel(R) HD Graphics
+0x8086, 0x0BD1, Low; Intel(R) HD Graphics
+0x8086, 0x0BD2, Low; Intel(R) HD Graphics
+0x8086, 0x0BD3, Low; Intel(R) HD Graphics
+0x8086, 0x0BD4, Low; Intel(R) HD Graphics
 0x8086, 0x1602, Low; Intel(R) HD Graphics
 0x8086, 0x1606, Low; Intel(R) HD Graphics
 0x8086, 0x160B, Low; Intel(R) HD Graphics
@@ -120,6 +129,15 @@
 0x8086, 0x163E, Low; Intel(R) HD Graphics
 
 ; Skylake
+0x8086, 0x0900, Medium; Intel(R) HD Graphics
+0x8086, 0x0901, Medium; Intel(R) HD Graphics
+0x8086, 0x0902, Medium; Intel(R) HD Graphics
+0x8086, 0x0903, Medium; Intel(R) HD Graphics
+0x8086, 0x0904, Medium; Intel(R) HD Graphics
+0x8086, 0x192D, Medium; Intel(R) HD Graphics
+0x8086, 0x1913, Medium; Intel(R) HD Graphics
+0x8086, 0x1923, Medium; Intel(R) HD Graphics
+0x8086, 0x193A, Medium; Intel(R) HD Graphics
 0x8086, 0x1902, Medium; Intel(R) HD Graphics 510
 0x8086, 0x1906, Medium; Intel(R) HD Graphics 510
 0x8086, 0x190A, Medium; Intel(R) HD Graphics
@@ -146,6 +164,21 @@
 0x8086, 0x22B3, Low; Intel(R) HD Graphics
 
 ; Kabylake
+0x8086, 0x590E, Low;	Intel(R) HD Graphics
+0x8086, 0x5915, Low;	Intel(R) HD Graphics
+0x8086, 0x5908, Low;	Intel(R) HD Graphics
+0x8086, 0x593B, Low;	Intel(R) HD Graphics
+0x8086, 0x590A, Low;	Intel(R) HD Graphics
+0x8086, 0x591A, Low;	Intel(R) HD Graphics
+0x8086, 0x5923, Low;	Intel(R) HD Graphics
+0x8086, 0x5932, Low;	Intel(R) HD Graphics
+0x8086, 0x592B, Low;	Intel(R) HD Graphics
+0x8086, 0x592A, Low;	Intel(R) HD Graphics
+0x8086, 0x593A, Low;	Intel(R) HD Graphics
+0x8086, 0x593D, Low;	Intel(R) HD Graphics
+0x8086, 0x87C0, Low;	Intel(R) HD Graphics
+0x8086, 0x5913, Low;	Intel(R) HD Graphics
+0x8086, 0x591C, Low;	Intel(R) HD Graphics
 0x8086, 0x5902, Low;	Intel(R) HD Graphics 610
 0x8086, 0x5906, Low;	Intel(R) HD Graphics 610
 0x8086, 0x590B, Low;	Intel(R) HD Graphics P610
@@ -162,7 +195,96 @@
 ; Coffeelake
 0x8086, 0x3E91, Medium;	Intel(R) UHD Graphics
 0x8086, 0x3E92, Medium;	Intel(R) UHD Graphics
+0x8086, 0x3E96, Medium;	Intel(R) UHD Graphics
 0x8086, 0x3E9B, Medium;	Intel(R) UHD Graphics
+0x8086, 0x3E9A, Medium;	Intel(R) UHD Graphics
 0x8086, 0x3EA5, High;	Intel(R) Iris Plus Graphics
+0x8086, 0x3EA6, High;	Intel(R) Iris Plus Graphics
+0x8086, 0x3EA7, High;	Intel(R) Iris Plus Graphics
+0x8086, 0x3EA8, High;	Intel(R) Iris Plus Graphics
 0x8086, 0x3E90, Low;	Intel(R) UHD Graphics
 0x8086, 0x3E93, Low;	Intel(R) UHD Graphics
+0x8086, 0x3E99, Low;	Intel(R) UHD Graphics
+0x8086, 0x3E94, Low;	Intel(R) UHD Graphics
+0x8086, 0x3E98, Low;	Intel(R) UHD Graphics
+0x8086, 0x3EA9, Low;	Intel(R) UHD Graphics
+0x8086, 0x3E9C, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BC6, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BE6, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BF6, Low;	Intel(R) UHD Graphics
+
+; Amberlake
+0x8086, 0x87CA, Low;	Intel(R) UHD Graphics
+
+; WhiskeyLake
+0x8086, 0x3EA1, Low;	Intel(R) UHD Graphics
+0x8086, 0x3EA4, Low;	Intel(R) UHD Graphics
+0x8086, 0x3EA0, Medium;	Intel(R) UHD Graphics
+0x8086, 0x3EA3, Medium;	Intel(R) UHD Graphics
+0x8086, 0x3EA2, High;	Intel(R) Iris Plus Graphics
+
+; CometLake GT1
+0x8086, 0x9B21, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BAA, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BAB, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BAC, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BA0, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BA5, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BA8, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BA4, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BA2, Low;	Intel(R) UHD Graphics
+
+; CometLake GT2
+0x8086, 0x9B41, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BCA, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BCB, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BCC, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BC0, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BC5, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BC8, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BC4, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BC2, Medium;	Intel(R) UHD Graphics
+
+; Geminilake
+0x8086, 0x3184, Medium;	Intel(R) UHD Graphics
+0x8086, 0x3185, Medium;	Intel(R) UHD Graphics
+
+; Icelake
+0x8086, 0x8A50, Medium;	Intel(R) Iris Plus Graphics (64 EUs)
+0x8086, 0x8A51, Medium;	Intel(R) Iris Plus Graphics (64 EUs)
+0x8086, 0x8A52, Medium;	Intel(R) Iris Plus Graphics (64 EUs)
+0x8086, 0x8A53, Medium;	Intel(R) Iris Plus Graphics (64 EUs)
+0x8086, 0x8A5C, Medium;	Intel(R) Iris Plus Graphics (48 EUs)
+0x8086, 0x8A59, Medium;	Intel(R) Iris Plus Graphics (48 EUs)
+0x8086, 0x8A5A, Medium;	Intel(R) Iris Plus Graphics (48 EUs)
+0x8086, 0x8A57, Medium;	Intel(R) Iris Plus Graphics (48 EUs)
+0x8086, 0x8A56, Medium;	Intel(R) Iris Plus Graphics (48 EUs)
+0x8086, 0x8A54, Medium;	Intel(R) Iris Plus Graphics (48 EUs)
+0x8086, 0x8A5D, Medium;	Intel(R) Iris Plus Graphics (32 EUs)
+0x8086, 0x8A58, Medium;	Intel(R) Iris Plus Graphics (32 EUs)
+0x8086, 0x8A5B, Medium;	Intel(R) Iris Plus Graphics (32 EUs)
+0x8086, 0x8A71, Medium;	Intel(R) Iris Plus Graphics (8 EUs)
+
+; Tigerlake
+0x8086, 0x9A49, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9A40, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9A59, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9A60, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9A68, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9A70, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9A78, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9A7F, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9AC9, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9AF8, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9AC0, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9AD9, Medium;	Intel(R) Iris(R) Xe Graphics
+
+; DG1
+0x8086, 0x4905, Medium; Intel(R) Iris(R) Xe MAX Graphics
+0x8086, 0x4906, Medium; Intel(R) Iris(R) Xe MAX Graphics
+0x8086, 0x4907, Medium; Intel(R) Iris(R) Xe MAX Graphics
+
+; ROCKETLAKE
+0x8086, 0x4C90, Medium; Intel(R) UHD Graphics
+0x8086, 0x4C8A, Medium; Intel(R) UHD Graphics
+0x8086, 0x4C8B, Medium; Intel(R) UHD Graphics
diff --git a/IHVs/gpudetect/TestMain.cpp b/IHVs/gpudetect/TestMain.cpp
new file mode 100644
index 0000000..5832175
--- /dev/null
+++ b/IHVs/gpudetect/TestMain.cpp
@@ -0,0 +1,311 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright 2017-2018 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef STRICT
+#define STRICT
+#endif
+
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifndef VC_EXTRALEAN
+#define VC_EXTRALEAN
+#endif
+
+#include <windows.h>
+
+#include <dxgi.h>
+#include <d3d11.h>
+#ifdef _WIN32_WINNT_WIN10
+#include <d3d11_3.h>
+#endif
+
+#include <cassert>
+#include <cstdlib>
+#include <cstdio>
+#include <string>
+
+#include "GPUDetect.h"
+
+
+// For parsing arguments
+bool isnumber( char* s )
+{
+	for( ; *s != '\0'; ++s )
+	{
+		if( !isdigit( *s ) )
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
+/*******************************************************************************
+ * printError
+ *
+ *     Prints the error on screen in a nice format.
+ *
+ ******************************************************************************/
+void printError( int errorCode )
+{
+	fprintf( stderr, "Error: " );
+
+	if( errorCode % GPUDETECT_ERROR_GENERAL_DXGI == 0 )
+	{
+		fprintf( stderr, "DXGI: " );
+	}
+
+	if( errorCode % GPUDETECT_ERROR_GENERAL_DXGI_COUNTER == 0 )
+	{
+		fprintf( stderr, "DXGI Counter: " );
+	}
+
+	if( errorCode % GPUDETECT_ERROR_REG_GENERAL_FAILURE == 0 )
+	{
+		fprintf( stderr, "Registry: " );
+	}
+
+	switch( errorCode )
+	{
+	case GPUDETECT_ERROR_DXGI_LOAD:
+		fprintf( stderr, "Could not load DXGI Library\n" );
+		break;
+
+	case GPUDETECT_ERROR_DXGI_ADAPTER_CREATION:
+		fprintf( stderr, "Could not create DXGI adapter\n" );
+		break;
+
+	case GPUDETECT_ERROR_DXGI_FACTORY_CREATION:
+		fprintf( stderr, "Could not create DXGI factory\n" );
+		break;
+
+	case GPUDETECT_ERROR_DXGI_DEVICE_CREATION:
+		fprintf( stderr, "Could not create DXGI device\n" );
+		break;
+
+	case GPUDETECT_ERROR_DXGI_GET_ADAPTER_DESC:
+		fprintf( stderr, "Could not get DXGI adapter\n" );
+		break;
+
+	case GPUDETECT_ERROR_DXGI_BAD_COUNTER:
+		fprintf( stderr, "Invalid DXGI counter data\n" );
+		break;
+
+	case GPUDETECT_ERROR_DXGI_COUNTER_CREATION:
+		fprintf( stderr, "Could not create DXGI counter\n" );
+		break;
+
+	case GPUDETECT_ERROR_DXGI_COUNTER_GET_DATA:
+		fprintf( stderr, "Could not get DXGI counter data\n" );
+		break;
+
+	case GPUDETECT_ERROR_REG_NO_D3D_KEY:
+		fprintf( stderr, "D3D driver info was not located in the expected location in the registry\n" );
+		break;
+
+	case GPUDETECT_ERROR_REG_MISSING_DRIVER_INFO:
+		fprintf( stderr, "Could not find a D3D driver matching the device ID and vendor ID of this adapter\n" );
+		break;
+
+	case GPUDETECT_ERROR_BAD_DATA:
+		fprintf( stderr, "Bad input data for function or precondition not met\n" );
+		break;
+
+	case GPUDETECT_ERROR_NOT_SUPPORTED:
+		fprintf( stderr, "Not supported\n" );
+		break;
+
+	default:
+		fprintf( stderr, "Unknown error\n" );
+		break;
+	}
+}
+
+/*******************************************************************************
+ * main
+ *
+ *     Function represents the game or application. The application checks for
+ *     graphics capabilities here and makes whatever decisions it needs to
+ *     based on the results.
+ *
+ ******************************************************************************/
+int main( int argc, char** argv )
+{
+	fprintf( stdout, "\n\n[ Intel GPUDetect ]\n" );
+	fprintf( stdout, "Build Info: %s, %s\n", __DATE__, __TIME__ );
+
+	int adapterIndex = 0;
+
+	if( argc == 1 )
+	{
+		fprintf( stdout, "Usage: GPUDetect adapter_index\n" );
+		fprintf( stdout, "Defaulting to adapter_index = %d\n", adapterIndex );
+	}
+	else if( argc == 2 && isnumber( argv[ 1 ] ))
+	{
+		adapterIndex = atoi( argv[ 1 ] );
+		fprintf( stdout, "Choosing adapter_index = %d\n", adapterIndex );
+	}
+	else
+	{
+		fprintf( stdout, "Usage: GPUDetect adapter_index\n" );
+		fprintf( stderr, "Error: unexpected arguments.\n" );
+		return EXIT_FAILURE;
+	}
+	fprintf( stdout,  "\n" );
+
+
+	IDXGIAdapter* adapter = nullptr;
+	int initReturnCode = GPUDetect::InitAdapter( &adapter, adapterIndex );
+	if( initReturnCode != EXIT_SUCCESS )
+	{
+		printError( initReturnCode );
+		return EXIT_FAILURE;
+	};
+
+	ID3D11Device* device = nullptr;
+	initReturnCode = GPUDetect::InitDevice( adapter, &device );
+	if( initReturnCode != EXIT_SUCCESS )
+	{
+		printError( initReturnCode );
+		adapter->Release();
+		return EXIT_FAILURE;
+	};
+
+	GPUDetect::GPUData gpuData = {};
+	initReturnCode = GPUDetect::InitExtensionInfo( &gpuData, adapter, device );
+	if( initReturnCode != EXIT_SUCCESS )
+	{
+		printError( initReturnCode );
+	}
+	else
+	{
+		fprintf( stdout, "Adapter #%d\n", adapterIndex );
+		fprintf( stdout, "-----------------------\n" );
+		fprintf( stdout, "VendorID: 0x%x\n", gpuData.vendorID );
+		fprintf( stdout, "DeviceID: 0x%x\n", gpuData.deviceID );
+		fprintf( stdout, "Video Memory: %I64u MB\n", gpuData.videoMemory / ( 1024 * 1024 ) );
+		fprintf( stdout, "Description: %S\n", gpuData.description );
+		fprintf( stdout, "\n" );
+
+		//
+		//  Find and print driver version information
+		//
+		initReturnCode = GPUDetect::InitDxDriverVersion( &gpuData );
+		if( gpuData.d3dRegistryDataAvailability )
+		{
+			fprintf( stdout, "\nDriver Information\n" );
+			fprintf( stdout, "-----------------------\n" );
+
+			char driverVersion[ 19 ] = {};
+			GPUDetect::GetDriverVersionAsCString( &gpuData, driverVersion, _countof(driverVersion) );
+			fprintf( stdout, "Driver Version: %s\n", driverVersion );
+
+			// Print out decoded data
+			fprintf( stdout, "Release Revision: %u\n", gpuData.driverInfo.driverReleaseRevision );
+			fprintf( stdout, "Build Number: %u\n", gpuData.driverInfo.driverBuildNumber );
+			fprintf( stdout, "\n" );
+		}
+
+		if( gpuData.vendorID == GPUDetect::INTEL_VENDOR_ID )
+		{
+
+# if 0
+			//
+			// This sample includes a .cfg file that maps known vendor and device IDs
+			// to example quality presets.  This looks up the preset for the IDs
+			// queried above.
+			//
+			const GPUDetect::PresetLevel defPresets = GPUDetect::GetDefaultFidelityPreset( &gpuData );
+			switch( defPresets )
+			{
+				case GPUDetect::PresetLevel::NotCompatible: fprintf( stdout, "Default Fidelity Preset Level: NotCompatible\n" ); break;
+				case GPUDetect::PresetLevel::Low:           fprintf( stdout, "Default Fidelity Preset Level: Low\n" );           break;
+				case GPUDetect::PresetLevel::Medium:        fprintf( stdout, "Default Fidelity Preset Level: Medium\n" );        break;
+				case GPUDetect::PresetLevel::MediumPlus:    fprintf( stdout, "Default Fidelity Preset Level: Medium+\n" );       break;
+				case GPUDetect::PresetLevel::High:          fprintf( stdout, "Default Fidelity Preset Level: High\n" );          break;
+				case GPUDetect::PresetLevel::Undefined:     fprintf( stdout, "Default Fidelity Preset Level: Undefined\n" );     break;
+			}
+
+			fprintf( stdout, "\n" );
+#endif
+
+
+			//
+			// Check if Intel DirectX extensions are available on this system.
+			//
+			if( gpuData.intelExtensionAvailability )
+			{
+				fprintf( stdout, "Supports Intel Iris Graphics extensions:\n" );
+				fprintf( stdout, "\tpixel synchronization\n" );
+				fprintf( stdout, "\tinstant access of graphics memory\n" );
+			}
+			else
+			{
+				fprintf( stdout, "Does not support Intel Iris Graphics extensions\n" );
+			}
+
+			fprintf( stdout, "\n" );
+
+
+			//
+			// In DirectX, Intel exposes additional information through the driver that can be obtained
+			// querying a special DX counter
+			//
+
+			// Populate the GPU architecture data with info from the counter, otherwise gpuDetect will use the value we got from the Dx11 extension
+			initReturnCode = GPUDetect::InitCounterInfo( &gpuData, device );
+			if( initReturnCode != EXIT_SUCCESS )
+			{
+				printError( initReturnCode );
+			}
+			else
+			{
+				fprintf( stdout, "Architecture (from DeviceID): %s\n", GPUDetect::GetIntelGPUArchitectureString( gpuData.architecture ));
+				fprintf( stdout, "using %s graphics\n", GPUDetect::GetIntelGraphicsGenerationString( GPUDetect::GetIntelGraphicsGeneration( gpuData.architecture )) );
+
+				//
+				// Older versions of the IntelDeviceInfo query only return
+				// GPUMaxFreq and GPUMinFreq, all other members will be zero.
+				//
+				if( gpuData.advancedCounterDataAvailability )
+				{
+					fprintf( stdout, "EU Count:          %u\n", gpuData.euCount );
+					fprintf( stdout, "Package TDP:       %u W\n", gpuData.packageTDP );
+					fprintf( stdout, "Max Fill Rate:     %u pixels/clock\n", gpuData.maxFillRate );
+				}
+
+				fprintf( stdout, "GPU Max Frequency: %u MHz\n", gpuData.maxFrequency );
+				fprintf( stdout, "GPU Min Frequency: %u MHz\n", gpuData.minFrequency );
+			}
+
+			fprintf( stdout, "\n" );
+		}
+	}
+
+	device->Release();
+	adapter->Release();
+
+	fprintf( stdout, "\n" );
+
+	return 0;
+}
diff --git a/IHVs/gpudetect/build/GPUDetect_Debug_x64.exe b/IHVs/gpudetect/build/GPUDetect_Debug_x64.exe
new file mode 100644
index 0000000..1a299d6
Binary files /dev/null and b/IHVs/gpudetect/build/GPUDetect_Debug_x64.exe differ
diff --git a/IHVs/gpudetect/build/GPUDetect_Debug_x64.idb b/IHVs/gpudetect/build/GPUDetect_Debug_x64.idb
new file mode 100644
index 0000000..b6e44f5
Binary files /dev/null and b/IHVs/gpudetect/build/GPUDetect_Debug_x64.idb differ
diff --git a/IHVs/gpudetect/build/GPUDetect_Debug_x64.lib b/IHVs/gpudetect/build/GPUDetect_Debug_x64.lib
new file mode 100644
index 0000000..fbe2983
Binary files /dev/null and b/IHVs/gpudetect/build/GPUDetect_Debug_x64.lib differ
diff --git a/IHVs/gpudetect/build/GPUDetect_Release_x64.lib b/IHVs/gpudetect/build/GPUDetect_Release_x64.lib
new file mode 100644
index 0000000..5d1a959
Binary files /dev/null and b/IHVs/gpudetect/build/GPUDetect_Release_x64.lib differ
diff --git a/IHVs/gpudetect/build/IntelGfx.cfg b/IHVs/gpudetect/build/IntelGfx.cfg
new file mode 100644
index 0000000..9714d65
--- /dev/null
+++ b/IHVs/gpudetect/build/IntelGfx.cfg
@@ -0,0 +1,290 @@
+;
+; Intel Graphics Preset Levels
+;
+; Format:
+; VendorIDHex, DeviceIDHex, Example Out of the Box Settings; Commented name of cards
+;
+
+; Other
+0x8086, 0x2982, Low; Intel(R) G35 Express Chipset Family
+0x8086, 0x2983, Low; Intel(R) G35 Express Chipset Family
+0x8086, 0x2A02, Low; Mobile Intel(R) 965 Express Chipset Family
+0x8086, 0x2A03, Low; Mobile Intel(R) 965 Express Chipset Family
+0x8086, 0x2A12, Low; Mobile Intel(R) 965 Express Chipset Family
+0x8086, 0x2A13, Low; Mobile Intel(R) 965 Express Chipset Family
+0x8086, 0x2A42, Low; Mobile Intel(R) 4 Series Express Chipset Family
+0x8086, 0x2A43, Low; Mobile Intel(R) 4 Series Express Chipset Family
+0x8086, 0x2E02, Low; Intel(R) 4 Series Express Chipset
+0x8086, 0x2E03, Low; Intel(R) 4 Series Express Chipset
+0x8086, 0x2E22, Low; Intel(R) G45/G43 Express Chipset
+0x8086, 0x2E23, Low; Intel(R) G45/G43 Express Chipset
+0x8086, 0x2E12, Low; Intel(R) Q45/Q43 Express Chipset
+0x8086, 0x2E13, Low; Intel(R) Q45/Q43 Express Chipset
+0x8086, 0x2E32, Low; Intel(R) G41 Express Chipset
+0x8086, 0x2E33, Low; Intel(R) G41 Express Chipset
+0x8086, 0x2E42, Low; Intel(R) B43 Express Chipset
+0x8086, 0x2E43, Low; Intel(R) B43 Express Chipset
+0x8086, 0x2E92, Low; Intel(R) B43 Express Chipset
+0x8086, 0x2E93, Low; Intel(R) B43 Express Chipset
+0x8086, 0x0046, Low; Intel(R) HD Graphics - Core i3/i5/i7 Mobile Processors
+0x8086, 0x0042, Low; Intel(R) HD Graphics - Core i3/i5 + Pentium G9650 Processors
+
+; Sandybridge
+0x8086, 0x0102, Low; Intel(R) HD Graphics 2000
+0x8086, 0x0106, Low; Intel(R) HD Graphics 2000
+0x8086, 0x0112, Low; Intel(R) HD Graphics 3000
+0x8086, 0x0116, Low; Intel(R) HD Graphics 3000
+0x8086, 0x0122, Low; Intel(R) HD Graphics 3000
+0x8086, 0x0126, Low; Intel(R) HD Graphics 3000
+0x8086, 0x010A, Low; Intel(R) HD Graphics
+
+; Ivybridge
+0x8086, 0x0152, Low; Intel(R) HD Graphics 2500
+0x8086, 0x0156, Low; Intel(R) HD Graphics 2500
+0x8086, 0x015A, Low; Intel(R) HD Graphics 2500
+0x8086, 0x0162, Low; Intel(R) HD Graphics 4000
+0x8086, 0x0166, Low; Intel(R) HD Graphics 4000
+0x8086, 0x016A, Low; Intel(R) HD Graphics 4000
+
+; Haswell
+0x8086, 0x0402, Low; Intel(R) HD Graphics
+0x8086, 0x0412, Low; Intel(R) HD Graphics 4600
+0x8086, 0x0422, Low; Intel(R) HD Graphics 5000
+0x8086, 0x0406, Low; Intel(R) HD Graphics
+0x8086, 0x0416, Low; Intel(R) HD Graphics 4600
+0x8086, 0x0426, Low; Intel(R) HD Graphics 5000
+0x8086, 0x040A, Low; Intel(R) HD Graphics
+0x8086, 0x041A, Low; Intel(R) HD Graphics P4600/P4700
+0x8086, 0x042A, Low; Intel(R) HD Graphics 5000
+0x8086, 0x040B, Low; Intel(R) HD Graphics
+0x8086, 0x041B, Low; Intel(R) HD Graphics
+0x8086, 0x042B, Low; Intel(R) HD Graphics
+0x8086, 0x040E, Low; Intel(R) HD Graphics
+0x8086, 0x041E, Low; Intel(R) HD Graphics
+0x8086, 0x042E, Low; Intel(R) HD Graphics
+0x8086, 0x0A02, Low; Intel(R) HD Graphics
+0x8086,	0x0A12, Low; Intel(R) HD Graphics
+0x8086,	0x0A22, Low; Intel(R) Iris(TM) Graphics 5100
+0x8086,	0x0A06, Low; Intel(R) HD Graphics
+0x8086,	0x0A16, Low; Intel(R) HD Graphics 4400
+0x8086,	0x0A26, Low; Intel(R) HD Graphics 5000
+0x8086,	0x0A0A, Low; Intel(R) HD Graphics
+0x8086,	0x0A1A, Low; Intel(R) HD Graphics
+0x8086,	0x0A2A, Low; Intel(R) Iris(TM) Graphics 5100
+0x8086,	0x0A0B, Low; Intel(R) HD Graphics
+0x8086,	0x0A1B, Low; Intel(R) HD Graphics
+0x8086,	0x0A2B, Low; Intel(R) Iris(TM) Graphics 5100
+0x8086,	0x0A0E, Low; Intel(R) HD Graphics
+0x8086,	0x0A1E, Low; Intel(R) HD Graphics 4200
+0x8086,	0x0A2E, Low; Intel(R) Iris(TM) Graphics 5100
+0x8086,	0x0D02, Low; Intel(R) HD Graphics
+0x8086,	0x0D12, Low; Intel(R) HD Graphics 4600
+0x8086,	0x0D22, Low; Intel(R) Iris(TM) Pro Graphics 5200
+0x8086,	0x0D06, Low; Intel(R) HD Graphics
+0x8086,	0x0D16, Low; Intel(R) HD Graphics 4600
+0x8086,	0x0D26, Low; Intel(R) Iris(TM) Pro Graphics 5200
+0x8086,	0x0D0A, Low; Intel(R) HD Graphics
+0x8086,	0x0D1A, Low; Intel(R) HD Graphics
+0x8086,	0x0D2A, Low; Intel(R) Iris(TM) Pro Graphics 5200
+0x8086,	0x0D0B, Low; Intel(R) HD Graphics
+0x8086,	0x0D1B, Low; Intel(R) HD Graphics
+0x8086,	0x0D2B, Low; Intel(R) Iris(TM) Pro Graphics 5200
+0x8086,	0x0D0E, Low; Intel(R) HD Graphics
+0x8086,	0x0D1E, Low; Intel(R) HD Graphics
+0x8086,	0x0D2E, Low; Intel(R) Iris(TM) Pro Graphics 5200
+
+; Valleyview
+0x8086, 0x0F30, Low; Intel(R) Vallyview Graphics
+0x8086, 0x0F31, Low; Intel(R) Vallyview Graphics
+
+; Broadwell
+0x8086, 0x0BD0, Low; Intel(R) HD Graphics
+0x8086, 0x0BD1, Low; Intel(R) HD Graphics
+0x8086, 0x0BD2, Low; Intel(R) HD Graphics
+0x8086, 0x0BD3, Low; Intel(R) HD Graphics
+0x8086, 0x0BD4, Low; Intel(R) HD Graphics
+0x8086, 0x1602, Low; Intel(R) HD Graphics
+0x8086, 0x1606, Low; Intel(R) HD Graphics
+0x8086, 0x160B, Low; Intel(R) HD Graphics
+0x8086, 0x160A, Low; Intel(R) HD Graphics
+0x8086, 0x160D, Low; Intel(R) HD Graphics
+0x8086, 0x160E, Low; Intel(R) HD Graphics
+0x8086, 0x1612, Low; Intel(R) HD Graphics 5600
+0x8086, 0x1616, Low; Intel(R) HD Graphics 5500
+0x8086, 0x161B, Low; Intel(R) HD Graphics
+0x8086, 0x161A, Low; Intel(R) HD Graphics
+0x8086, 0x161D, Low; Intel(R) HD Graphics
+0x8086, 0x161E, Low; Intel(R) HD Graphics 5300
+0x8086, 0x1622, Low; Intel(R) Iris(TM) Pro Graphics 6200
+0x8086, 0x1626, Low; Intel(R) HD Graphics 6000
+0x8086, 0x162B, Low; Intel(R) Iris(TM) Graphics 6100
+0x8086, 0x162A, Low; Intel(R) Iris(TM) Pro Graphics P6300
+0x8086, 0x162D, Low; Intel(R) HD Graphics
+0x8086, 0x162E, Low; Intel(R) HD Graphics
+0x8086, 0x1632, Low; Intel(R) HD Graphics
+0x8086, 0x1636, Low; Intel(R) HD Graphics
+0x8086, 0x163B, Low; Intel(R) HD Graphics
+0x8086, 0x163A, Low; Intel(R) HD Graphics
+0x8086, 0x163D, Low; Intel(R) HD Graphics
+0x8086, 0x163E, Low; Intel(R) HD Graphics
+
+; Skylake
+0x8086, 0x0900, Medium; Intel(R) HD Graphics
+0x8086, 0x0901, Medium; Intel(R) HD Graphics
+0x8086, 0x0902, Medium; Intel(R) HD Graphics
+0x8086, 0x0903, Medium; Intel(R) HD Graphics
+0x8086, 0x0904, Medium; Intel(R) HD Graphics
+0x8086, 0x192D, Medium; Intel(R) HD Graphics
+0x8086, 0x1913, Medium; Intel(R) HD Graphics
+0x8086, 0x1923, Medium; Intel(R) HD Graphics
+0x8086, 0x193A, Medium; Intel(R) HD Graphics
+0x8086, 0x1902, Medium; Intel(R) HD Graphics 510
+0x8086, 0x1906, Medium; Intel(R) HD Graphics 510
+0x8086, 0x190A, Medium; Intel(R) HD Graphics
+0x8086, 0x190B, Medium; Intel(R) HD Graphics
+0x8086, 0x190E, Medium; Intel(R) HD Graphics
+0x8086, 0x1912, Medium; Intel(R) HD Graphics 530
+0x8086, 0x1916, Medium; Intel(R) HD Graphics 520
+0x8086, 0x191A, Medium; Intel(R) HD Graphics
+0x8086, 0x191B, Medium; Intel(R) HD Graphics 530
+0x8086, 0x191D, Medium; Intel(R) HD Graphics P530
+0x8086, 0x191E, Medium; Intel(R) HD Graphics 515
+0x8086, 0x1921, Medium; Intel(R) HD Graphics
+0x8086, 0x1926, Medium;	Intel(R) Iris Graphics 540
+0x8086, 0x1927, Medium;	Intel(R) Iris Graphics 540
+0x8086, 0x192A, Medium; Intel(R) HD Graphics
+0x8086, 0x192B, Medium; Intel(R) HD Graphics
+0x8086, 0x193B, High;	Intel(R) Iris Pro Graphics 580
+0x8086, 0x193D, High;	Intel(R) Iris Pro Graphics P580
+
+; CherryTrail and Braswell
+0x8086, 0x22B0, Low; Intel(R) HD Graphics
+0x8086, 0x22B1, Low; Intel(R) HD Graphics
+0x8086, 0x22B2, Low; Intel(R) HD Graphics
+0x8086, 0x22B3, Low; Intel(R) HD Graphics
+
+; Kabylake
+0x8086, 0x590E, Low;	Intel(R) HD Graphics
+0x8086, 0x5915, Low;	Intel(R) HD Graphics
+0x8086, 0x5908, Low;	Intel(R) HD Graphics
+0x8086, 0x593B, Low;	Intel(R) HD Graphics
+0x8086, 0x590A, Low;	Intel(R) HD Graphics
+0x8086, 0x591A, Low;	Intel(R) HD Graphics
+0x8086, 0x5923, Low;	Intel(R) HD Graphics
+0x8086, 0x5932, Low;	Intel(R) HD Graphics
+0x8086, 0x592B, Low;	Intel(R) HD Graphics
+0x8086, 0x592A, Low;	Intel(R) HD Graphics
+0x8086, 0x593A, Low;	Intel(R) HD Graphics
+0x8086, 0x593D, Low;	Intel(R) HD Graphics
+0x8086, 0x87C0, Low;	Intel(R) HD Graphics
+0x8086, 0x5913, Low;	Intel(R) HD Graphics
+0x8086, 0x591C, Low;	Intel(R) HD Graphics
+0x8086, 0x5902, Low;	Intel(R) HD Graphics 610
+0x8086, 0x5906, Low;	Intel(R) HD Graphics 610
+0x8086, 0x590B, Low;	Intel(R) HD Graphics P610
+0x8086, 0x5912, Medium;	Intel(R) HD Graphics 630
+0x8086, 0x5916, Medium;	Intel(R) HD Graphics 620
+0x8086, 0x5917, Medium;	Intel(R) UHD Graphics 620
+0x8086, 0x591B, Medium;	Intel(R) HD Graphics 630
+0x8086, 0x591D, Medium;	Intel(R) HD Graphics P630
+0x8086, 0x591E, Low;	Intel(R) HD Graphics 615
+0x8086, 0x5921, Medium;	Intel(R) HD Graphics 620
+0x8086, 0x5926, High;	Intel(R) Iris Plus Graphics 640
+0x8086, 0x5927, High;	Intel(R) Iris Plus Graphics 650
+
+; Coffeelake
+0x8086, 0x3E91, Medium;	Intel(R) UHD Graphics
+0x8086, 0x3E92, Medium;	Intel(R) UHD Graphics
+0x8086, 0x3E96, Medium;	Intel(R) UHD Graphics
+0x8086, 0x3E9B, Medium;	Intel(R) UHD Graphics
+0x8086, 0x3E9A, Medium;	Intel(R) UHD Graphics
+0x8086, 0x3EA5, High;	Intel(R) Iris Plus Graphics
+0x8086, 0x3EA6, High;	Intel(R) Iris Plus Graphics
+0x8086, 0x3EA7, High;	Intel(R) Iris Plus Graphics
+0x8086, 0x3EA8, High;	Intel(R) Iris Plus Graphics
+0x8086, 0x3E90, Low;	Intel(R) UHD Graphics
+0x8086, 0x3E93, Low;	Intel(R) UHD Graphics
+0x8086, 0x3E99, Low;	Intel(R) UHD Graphics
+0x8086, 0x3E94, Low;	Intel(R) UHD Graphics
+0x8086, 0x3E98, Low;	Intel(R) UHD Graphics
+0x8086, 0x3EA9, Low;	Intel(R) UHD Graphics
+0x8086, 0x3E9C, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BC6, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BE6, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BF6, Low;	Intel(R) UHD Graphics
+
+; Amberlake
+0x8086, 0x87CA, Low;	Intel(R) UHD Graphics
+
+; WhiskeyLake
+0x8086, 0x3EA1, Low;	Intel(R) UHD Graphics
+0x8086, 0x3EA4, Low;	Intel(R) UHD Graphics
+0x8086, 0x3EA0, Medium;	Intel(R) UHD Graphics
+0x8086, 0x3EA3, Medium;	Intel(R) UHD Graphics
+0x8086, 0x3EA2, High;	Intel(R) Iris Plus Graphics
+
+; CometLake GT1
+0x8086, 0x9B21, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BAA, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BAB, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BAC, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BA0, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BA5, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BA8, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BA4, Low;	Intel(R) UHD Graphics
+0x8086, 0x9BA2, Low;	Intel(R) UHD Graphics
+
+; CometLake GT2
+0x8086, 0x9B41, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BCA, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BCB, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BCC, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BC0, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BC5, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BC8, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BC4, Medium;	Intel(R) UHD Graphics
+0x8086, 0x9BC2, Medium;	Intel(R) UHD Graphics
+
+; Geminilake
+0x8086, 0x3184, Medium;	Intel(R) UHD Graphics
+0x8086, 0x3185, Medium;	Intel(R) UHD Graphics
+
+; Icelake
+0x8086, 0x8A50, Medium;	Intel(R) Iris Plus Graphics (64 EUs)
+0x8086, 0x8A51, Medium;	Intel(R) Iris Plus Graphics (64 EUs)
+0x8086, 0x8A52, Medium;	Intel(R) Iris Plus Graphics (64 EUs)
+0x8086, 0x8A53, Medium;	Intel(R) Iris Plus Graphics (64 EUs)
+0x8086, 0x8A5C, Medium;	Intel(R) Iris Plus Graphics (48 EUs)
+0x8086, 0x8A59, Medium;	Intel(R) Iris Plus Graphics (48 EUs)
+0x8086, 0x8A5A, Medium;	Intel(R) Iris Plus Graphics (48 EUs)
+0x8086, 0x8A57, Medium;	Intel(R) Iris Plus Graphics (48 EUs)
+0x8086, 0x8A56, Medium;	Intel(R) Iris Plus Graphics (48 EUs)
+0x8086, 0x8A54, Medium;	Intel(R) Iris Plus Graphics (48 EUs)
+0x8086, 0x8A5D, Medium;	Intel(R) Iris Plus Graphics (32 EUs)
+0x8086, 0x8A58, Medium;	Intel(R) Iris Plus Graphics (32 EUs)
+0x8086, 0x8A5B, Medium;	Intel(R) Iris Plus Graphics (32 EUs)
+0x8086, 0x8A71, Medium;	Intel(R) Iris Plus Graphics (8 EUs)
+
+; Tigerlake
+0x8086, 0x9A49, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9A40, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9A59, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9A60, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9A68, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9A70, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9A78, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9A7F, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9AC9, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9AF8, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9AC0, Medium;	Intel(R) Iris(R) Xe Graphics
+0x8086, 0x9AD9, Medium;	Intel(R) Iris(R) Xe Graphics
+
+; DG1
+0x8086, 0x4905, Medium; Intel(R) Iris(R) Xe MAX Graphics
+0x8086, 0x4906, Medium; Intel(R) Iris(R) Xe MAX Graphics
+0x8086, 0x4907, Medium; Intel(R) Iris(R) Xe MAX Graphics
+
+; ROCKETLAKE
+0x8086, 0x4C90, Medium; Intel(R) UHD Graphics
+0x8086, 0x4C8A, Medium; Intel(R) UHD Graphics
+0x8086, 0x4C8B, Medium; Intel(R) UHD Graphics
diff --git a/gpudetect/license.txt b/IHVs/gpudetect/license.txt
similarity index 100%
rename from gpudetect/license.txt
rename to IHVs/gpudetect/license.txt
diff --git a/gpudetect/readme.md b/IHVs/gpudetect/readme.md
similarity index 53%
rename from gpudetect/readme.md
rename to IHVs/gpudetect/readme.md
index 3b51ba4..994129c 100644
--- a/gpudetect/readme.md
+++ b/IHVs/gpudetect/readme.md
@@ -1,18 +1,20 @@
-#GPU Detect
+# GPU Detect
 
-##Overview
-This short sample demonstrates a way to detect the primary graphics hardware present in a system, and to initialize a game’s default fidelity presets based on the found graphics device. The code and accompanying data is meant to be used as a guideline, and should be adapted to the game’s specific needs. The sample is specific to Microsoft Windows although some of the information will be applicable on other operating systems.
+## Overview
+This short sample demonstrates a way to detect the primary graphics hardware present in a system, and to initialize a game's default fidelity presets based on the found graphics device. The code and accompanying data is meant to be used as a guideline, and should be adapted to the game's specific needs. The sample is specific to Microsoft Windows although some of the information will be applicable on other operating systems.
 
 The API can be used to obtain a default quality setting for the device from the data provided in the vendor specific configuration files. Additionally, the Vendor ID and Device ID of the primary graphics device can be queried. The API works by using the DXGI interface. If the Vendor ID is recognized, the code then looks for a configuration file specific to that vendor. In the example, the configuration file is used to list the expected performance levels (Low / Medium / High) of all relevant devices from that vendor. If the device is not recognized the API returns the lowest quality level as a safe fall-back.
 
-This sample is intended for customers developing graphical applications who wish to target Intel® graphics devices.
-##File List
-*	DeviceId.h – Header file for device detection code.
-*	DeviceId.cpp – Implementation of functions to obtain information about graphics devices.
-*	IntelGfx.cfg – Sample configuration file with list of known Intel GPU devices, their device IDs, and example expected graphics performance levels with regards to the calling game / application.
-*	TestMain.cpp – Simple console based test utility that calls the above functions, and displays the result.
+This sample is intended for customers developing graphical applications who wish to target Intel(tm) graphics devices.
+## File List
+*	DeviceId.h -> Header file for device ID code.
+*	DeviceId.cpp -> Implementation of functions to convert the device ID into more useful information.
+*	GPUDetect.h -> Header file for GPU detection code.
+*	GPUDetect.cpp -> Implementation of functions to obtain information about graphics devices.
+*	IntelGfx.cfg -> Sample configuration file with list of known Intel GPU devices, their device IDs, and example expected graphics performance levels with regards to the calling game / application.
+*	TestMain.cpp -> Simple console based test utility that calls the above functions, and displays the result.
 
-##Configuration File
+## Configuration File
 The configuration file is an example of what could be done using information from GPU Detect. It has one line each for a known GPU device. The Vendor ID is repeated for clarity here. In this example file, each graphics device has been categorized as Low, Medium, or High based on the applications tested performance on each of these parts.
 ```
 ;
@@ -27,12 +29,11 @@ The configuration file is an example of what could be done using information fro
 0x8086, 0x1622, High; Intel(R) Iris Pro Graphics 6200
 ```
 
-##Building
+## Building
 This project requires the latest Windows SDK.
 
-##Links
-*	[Intel® Graphics Developer's Guides]() - For more information on developing for Intel® graphics.
-*	[Developing for Visual Computing Forums]() - Forum for answers on software issues.
-*	[Intel® Graphics Performance Analyzer]() – Must have tool for any graphics developer.
-*	[What If?]() – Technologies in research from Intel® much beyond the cutting edge.
-*	[Intel Developer Zone GameDev]() – Articles and samples related to developing games
+## Links
+*	[Intel(tm) Graphics Developer's Guides](https://software.intel.com/en-us/articles/intel-hd-graphics-developers-guides) - For more information on developing for Intel(tm) graphics.
+*	[Intel(tm) Developer Zone Games & Graphics Forum](https://software.intel.com/en-us/forums/developing-games-and-graphics-on-intel) - Forum for answers on software issues.
+*	[Intel(tm) GameDev Developer Zone](https://software.intel.com/en-us/gamedev) - Articles and samples related to developing games
+*	[Intel(tm) Graphics Performance Analyzer](https://software.intel.com/en-us/gpa) -Must have tool for any graphics developer.
diff --git a/nvapi_lib/lib/nvapi.lib b/IHVs/nvapi_lib/lib/nvapi.lib
similarity index 100%
rename from nvapi_lib/lib/nvapi.lib
rename to IHVs/nvapi_lib/lib/nvapi.lib
diff --git a/nvapi_lib/lib/nvapi64.lib b/IHVs/nvapi_lib/lib/nvapi64.lib
similarity index 100%
rename from nvapi_lib/lib/nvapi64.lib
rename to IHVs/nvapi_lib/lib/nvapi64.lib
diff --git a/nvapi_lib/nvapi.h b/IHVs/nvapi_lib/nvapi.h
similarity index 100%
rename from nvapi_lib/nvapi.h
rename to IHVs/nvapi_lib/nvapi.h
diff --git a/nvapi_lib/nvapi_lite_common.h b/IHVs/nvapi_lib/nvapi_lite_common.h
similarity index 100%
rename from nvapi_lib/nvapi_lite_common.h
rename to IHVs/nvapi_lib/nvapi_lite_common.h
diff --git a/nvapi_lib/nvapi_lite_d3dext.h b/IHVs/nvapi_lib/nvapi_lite_d3dext.h
similarity index 100%
rename from nvapi_lib/nvapi_lite_d3dext.h
rename to IHVs/nvapi_lib/nvapi_lite_d3dext.h
diff --git a/nvapi_lib/nvapi_lite_salend.h b/IHVs/nvapi_lib/nvapi_lite_salend.h
similarity index 100%
rename from nvapi_lib/nvapi_lite_salend.h
rename to IHVs/nvapi_lib/nvapi_lite_salend.h
diff --git a/nvapi_lib/nvapi_lite_salstart.h b/IHVs/nvapi_lib/nvapi_lite_salstart.h
similarity index 100%
rename from nvapi_lib/nvapi_lite_salstart.h
rename to IHVs/nvapi_lib/nvapi_lite_salstart.h
diff --git a/nvapi_lib/nvapi_lite_sli.h b/IHVs/nvapi_lib/nvapi_lite_sli.h
similarity index 100%
rename from nvapi_lib/nvapi_lite_sli.h
rename to IHVs/nvapi_lib/nvapi_lite_sli.h
diff --git a/nvapi_lib/nvapi_lite_stereo.h b/IHVs/nvapi_lib/nvapi_lite_stereo.h
similarity index 100%
rename from nvapi_lib/nvapi_lite_stereo.h
rename to IHVs/nvapi_lib/nvapi_lite_stereo.h
diff --git a/nvapi_lib/nvapi_lite_surround.h b/IHVs/nvapi_lib/nvapi_lite_surround.h
similarity index 100%
rename from nvapi_lib/nvapi_lite_surround.h
rename to IHVs/nvapi_lib/nvapi_lite_surround.h
diff --git a/MinHook/build/VC15/libMinHook.vcxproj b/MinHook/build/VC15/libMinHook.vcxproj
index 7de7314..f6096db 100644
--- a/MinHook/build/VC15/libMinHook.vcxproj
+++ b/MinHook/build/VC15/libMinHook.vcxproj
@@ -22,31 +22,31 @@
     <ProjectGuid>{F142A341-5EE0-442D-A15F-98AE9B48DBAE}</ProjectGuid>
     <RootNamespace>libMinHook</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/OCAT.sln b/OCAT.sln
index 8c1b71a..306f31c 100644
--- a/OCAT.sln
+++ b/OCAT.sln
@@ -63,7 +63,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PresentMonInterface", "Pres
 		{62089454-A7BA-4416-9E4B-EB0085797582} = {62089454-A7BA-4416-9E4B-EB0085797582}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPUDetect", "gpudetect\GPUDetect_2017.vcxproj", "{83F2F347-9ECF-4A29-9F65-05794A299F00}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPUDetect", "IHVs\gpudetect\GPUDetect.vcxproj", "{83F2F347-9ECF-4A29-9F65-05794A299F00}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/PresentMon/PresentMon/CommandLine.cpp b/PresentMon/PresentMon/CommandLine.cpp
index 1d5cca4..c98bdbf 100644
--- a/PresentMon/PresentMon/CommandLine.cpp
+++ b/PresentMon/PresentMon/CommandLine.cpp
@@ -264,7 +264,7 @@ void PrintHelp()
 bool ParseCommandLine(int argc, char** argv, CommandLineArgs* args)
 {
   args->mTargetProcessNames.clear();
-  args->mBlackList.clear();
+  args->mDenyList.clear();
   args->mOutputFileName = nullptr;
   args->mEtlFileName = nullptr;
   args->mTargetPid = 0;
@@ -323,7 +323,7 @@ bool ParseCommandLine(int argc, char** argv, CommandLineArgs* args)
     else ARG2("-output_file",            args->mOutputFileName				= argv[i])
 
     // Control and filtering options
-    else ARG2("-exclude",				 args->mBlackList.emplace_back(argv[i]))
+    else ARG2("-exclude",				 args->mDenyList.emplace_back(argv[i]))
     else ARG1("-hotkey",                 AssignHotkey(&i, argc, argv, args))
     else ARG1("-scroll_toggle",          args->mScrollLockToggle			= true)
     else ARG1("-scroll_indicator",       args->mScrollLockIndicator			= true)
diff --git a/PresentMon/PresentMon/PresentMon.cpp b/PresentMon/PresentMon/PresentMon.cpp
index 0cca4ea..e02093c 100644
--- a/PresentMon/PresentMon/PresentMon.cpp
+++ b/PresentMon/PresentMon/PresentMon.cpp
@@ -39,8 +39,8 @@ static void map_erase_if(Map& m, F pred)
 
 static bool IsTargetProcess(CommandLineArgs const& args, uint32_t processId, wchar_t const* processName)
 {
-  // -blacklist
-  for (auto excludeProcessName : args.mBlackList) {
+  // -denylist
+  for (auto excludeProcessName : args.mDenyList) {
     if (_stricmp(excludeProcessName.c_str(), ConvertUTF16StringToUTF8String(processName).c_str()) == 0) {
       return false;
     }
diff --git a/PresentMon/PresentMon/commandline.hpp b/PresentMon/PresentMon/commandline.hpp
index fd463f6..fb78d4b 100644
--- a/PresentMon/PresentMon/commandline.hpp
+++ b/PresentMon/PresentMon/commandline.hpp
@@ -70,7 +70,7 @@ struct SystemSpecs
 
 struct CommandLineArgs {
   std::vector<const char*> mTargetProcessNames;
-  std::vector<std::string> mBlackList;
+  std::vector<std::string> mDenyList;
   const char *mOutputFileName = nullptr;
   const char *mEtlFileName = nullptr;
   UINT mTargetPid = 0;
diff --git a/PresentMonInterface/PresentMonInterface.cpp b/PresentMonInterface/PresentMonInterface.cpp
index a7810f9..8da1df4 100644
--- a/PresentMonInterface/PresentMonInterface.cpp
+++ b/PresentMonInterface/PresentMonInterface.cpp
@@ -21,7 +21,7 @@ SOFTWARE.
 */
 
 #include "PresentMonInterface.h"
-#include "Config/BlackList.h"
+#include "Config/DenyList.h"
 #include "Config/Config.h"
 #include "Logging/MessageLog.h"
 #include "Recording.h"
@@ -55,10 +55,10 @@ bool PresentMonInterface::Init(HWND hwnd, std::string version)
     return false;
   }
 
-  BlackList blackList;
-  blackList.SetVersion(version);
-  blackList.Load();
-  blackList_ = blackList.GetBlackList();
+  DenyList denyList;
+  denyList.SetVersion(version);
+  denyList.Load();
+  denyList_ = denyList.GetDenyList();
 
   g_hWnd = hwnd; // Tell PresentMon where to send its messages 
   recording_.SetRecordingDirectory(g_fileDirectory.GetDirectory(DirectoryType::Recording));
@@ -137,11 +137,11 @@ void PresentMonInterface::SetPresentMonArgs(unsigned int timer)
                           frameInfo, estimatedDriverLag, width, height);
   };
 
-  BlackList blackList;
-  blackList.Load();
-  blackList_ = blackList.GetBlackList();
+  DenyList denyList;
+  denyList.Load();
+  denyList_ = denyList.GetDenyList();
 
-  args_.mBlackList = blackList_;
+  args_.mDenyList = denyList_;
 
   args_.mIncludeWindowsMixedReality = true;
 
diff --git a/PresentMonInterface/PresentMonInterface.h b/PresentMonInterface/PresentMonInterface.h
index a0b8300..ad4d9d6 100644
--- a/PresentMonInterface/PresentMonInterface.h
+++ b/PresentMonInterface/PresentMonInterface.h
@@ -23,7 +23,7 @@ SOFTWARE.
 #pragma once
 
 #include "Recording.h"
-#include "Config/BlackList.h"
+#include "Config/DenyList.h"
 
 #include "../PresentMon/PresentMon/commandline.hpp"
 
@@ -51,7 +51,7 @@ class PresentMonInterface
 
   Recording recording_;
   CommandLineArgs args_;
-  std::vector<std::string> blackList_;
+  std::vector<std::string> denyList_;
 
   std::string targetProcessName_;
   std::string outputFileName_;
diff --git a/PresentMonInterface/PresentMonInterface.vcxproj b/PresentMonInterface/PresentMonInterface.vcxproj
index d9fc724..2370fa5 100644
--- a/PresentMonInterface/PresentMonInterface.vcxproj
+++ b/PresentMonInterface/PresentMonInterface.vcxproj
@@ -22,32 +22,32 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{085C58B9-7145-4701-8155-8CDA6F4E222D}</ProjectGuid>
     <RootNamespace>PresentMonInterface</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -90,7 +90,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)PresentMon\PresentMon;$(SolutionDir)PresentMon;$(SolutionDir)ags_lib\inc;$(SolutionDir)nvapi_lib;$(SolutionDir)gpudetect</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)PresentMon\PresentMon;$(SolutionDir)PresentMon;$(SolutionDir)IHVs\ags_lib\inc;$(SolutionDir)IHVs\nvapi_lib;$(SolutionDir)IHVs\gpudetect</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;shell32.lib;shlwapi.lib;tdh.lib;$(OutDir)Commons$(PlatformArchitecture).lib;amd_ags_x64.lib;nvapi64.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -98,14 +98,14 @@
     </Link>
     <Lib>
       <AdditionalDependencies>amd_ags_x64.lib;nvapi64.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)ags_lib\lib;$(SolutionDir)nvapi_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)IHVs\ags_lib\lib;$(SolutionDir)IHVs\nvapi_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Lib>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <PostBuildEvent>
-      <Command>xcopy /y /d "$(SolutionDir)ags_lib\lib\amd_ags_x64.*" "$(OutDir)"
-xcopy /y /d "$(SolutionDir)nvapi_lib\lib\nvapi64.lib"  "$(OutDir)"
+      <Command>xcopy /y /d "$(SolutionDir)IHVs\ags_lib\lib\amd_ags_x64.*" "$(OutDir)"
+xcopy /y /d "$(SolutionDir)IHVs\nvapi_lib\lib\nvapi64.lib"  "$(OutDir)"
 xcopy /y /d "$(SolutionDir)sounds\*.wav"  "$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -114,7 +114,7 @@ xcopy /y /d "$(SolutionDir)sounds\*.wav"  "$(OutDir)"</Command>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)PresentMon\PresentMon;$(SolutionDir)PresentMon;$(SolutionDir)ags_lib\inc;$(SolutionDir)nvapi_lib;$(SolutionDir)gpudetect</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)PresentMon\PresentMon;$(SolutionDir)PresentMon;$(SolutionDir)IHVs\ags_lib\inc;$(SolutionDir)IHVs\nvapi_lib;$(SolutionDir)IHVs\gpudetect</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;shell32.lib;shlwapi.lib;tdh.lib;$(OutDir)Commons$(PlatformArchitecture).lib;amd_ags_x86.lib;nvapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -122,14 +122,14 @@ xcopy /y /d "$(SolutionDir)sounds\*.wav"  "$(OutDir)"</Command>
     </Link>
     <Lib>
       <AdditionalDependencies>amd_ags_x86.lib;nvapi.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)ags_lib\lib;$(SolutionDir)nvapi_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)IHVs\ags_lib\lib;$(SolutionDir)IHVs\nvapi_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Lib>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <PostBuildEvent>
-      <Command>xcopy /y /d "$(SolutionDir)ags_lib\lib\amd_ags_x86.*"  "$(OutDir)"
-xcopy /y /d "$(SolutionDir)nvapi_lib\lib\nvapi.lib"  "$(OutDir)"
+      <Command>xcopy /y /d "$(SolutionDir)IHVs\ags_lib\lib\amd_ags_x86.*"  "$(OutDir)"
+xcopy /y /d "$(SolutionDir)IHVs\nvapi_lib\lib\nvapi.lib"  "$(OutDir)"
 xcopy /y /d "$(SolutionDir)sounds\*.wav"  "$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -140,7 +140,7 @@ xcopy /y /d "$(SolutionDir)sounds\*.wav"  "$(OutDir)"</Command>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)PresentMon\PresentMon;$(SolutionDir)PresentMon;$(SolutionDir)ags_lib\inc;$(SolutionDir)nvapi_lib;$(SolutionDir)gpudetect</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)PresentMon\PresentMon;$(SolutionDir)PresentMon;$(SolutionDir)IHVs\ags_lib\inc;$(SolutionDir)IHVs\nvapi_lib;$(SolutionDir)IHVs\gpudetect</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -150,14 +150,14 @@ xcopy /y /d "$(SolutionDir)sounds\*.wav"  "$(OutDir)"</Command>
     </Link>
     <Lib>
       <AdditionalDependencies>amd_ags_x86.lib;nvapi.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)ags_lib\lib;$(SolutionDir)nvapi_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)IHVs\ags_lib\lib;$(SolutionDir)IHVs\nvapi_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Lib>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <PostBuildEvent>
-      <Command>xcopy /y /d "$(SolutionDir)ags_lib\lib\amd_ags_x86.*"  "$(OutDir)"
-xcopy /y /d "$(SolutionDir)nvapi_lib\lib\nvapi.lib"  "$(OutDir)"
+      <Command>xcopy /y /d "$(SolutionDir)IHVs\ags_lib\lib\amd_ags_x86.*"  "$(OutDir)"
+xcopy /y /d "$(SolutionDir)IHVs\nvapi_lib\lib\nvapi.lib"  "$(OutDir)"
 xcopy /y /d "$(SolutionDir)sounds\*.wav"  "$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -168,7 +168,7 @@ xcopy /y /d "$(SolutionDir)sounds\*.wav"  "$(OutDir)"</Command>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)PresentMon\PresentMon;$(SolutionDir)PresentMon;$(SolutionDir)ags_lib\inc;$(SolutionDir)nvapi_lib;$(SolutionDir)gpudetect</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Commons;$(SolutionDir)PresentMon\PresentMon;$(SolutionDir)PresentMon;$(SolutionDir)IHVs\ags_lib\inc;$(SolutionDir)IHVs\nvapi_lib;$(SolutionDir)IHVs\gpudetect</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -178,14 +178,14 @@ xcopy /y /d "$(SolutionDir)sounds\*.wav"  "$(OutDir)"</Command>
     </Link>
     <Lib>
       <AdditionalDependencies>amd_ags_x64.lib;nvapi64.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)ags_lib\lib;$(SolutionDir)nvapi_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)IHVs\ags_lib\lib;$(SolutionDir)IHVs\nvapi_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Lib>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <PostBuildEvent>
-      <Command>xcopy /y /d "$(SolutionDir)ags_lib\lib\amd_ags_x64.*" "$(OutDir)"
-xcopy /y /d "$(SolutionDir)nvapi_lib\lib\nvapi64.lib" "$(OutDir)"
+      <Command>xcopy /y /d "$(SolutionDir)IHVs\ags_lib\lib\amd_ags_x64.*" "$(OutDir)"
+xcopy /y /d "$(SolutionDir)IHVs\nvapi_lib\lib\nvapi64.lib" "$(OutDir)"
 xcopy /y /d "$(SolutionDir)sounds\*.wav" "$(OutDir)"
 </Command>
     </PostBuildEvent>
diff --git a/PresentMonInterface/Recording.cpp b/PresentMonInterface/Recording.cpp
index c61dbd4..9d1273b 100644
--- a/PresentMonInterface/Recording.cpp
+++ b/PresentMonInterface/Recording.cpp
@@ -40,7 +40,9 @@
 // Nvidia
 #include "nvapi.h"
 // Intel
-#include "DeviceId.h"
+#include <dxgi.h>
+#include <d3d11.h>
+#include "GPUDetect.h"
 
 const std::wstring Recording::defaultProcessName_ = L"*";
 
@@ -261,7 +263,7 @@ void Recording::ReadRegistry()
                                    (LPBYTE)processor, &processorSize);
 
   std::wstring processorStr = processor;
-  specs_.cpu = "\"" + std::string(processorStr.begin(), processorStr.end()) + "\"";
+  specs_.cpu = "\"" + ConvertUTF16StringToUTF8String(processorStr) + "\"";
 
   resultRegistry =
       RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0,
@@ -269,20 +271,31 @@ void Recording::ReadRegistry()
   WCHAR osProduct[512];
   DWORD osProductSize = sizeof(osProduct);
   resultRegistry = RegQueryValueEx(registryKey, L"ProductName", 0, NULL, (LPBYTE)osProduct, &osProductSize);
-  WCHAR releaseId[512];
-  DWORD releaseIdSize = sizeof(releaseId);
-  resultRegistry = RegQueryValueEx(registryKey, L"ReleaseId", 0, NULL, (LPBYTE)releaseId, &releaseIdSize);
-  WCHAR buildLabEx[512];
-  DWORD buildLabExSize = sizeof(buildLabEx);
-  resultRegistry = RegQueryValueEx(registryKey, L"BuildLabEx", 0, NULL, (LPBYTE)buildLabEx, &buildLabExSize);
+  WCHAR displayVersion[512];
+  DWORD displayVersionSize = sizeof(displayVersion);
+  resultRegistry = RegQueryValueEx(registryKey, L"DisplayVersion", 0, NULL, (LPBYTE)displayVersion,
+                                   &displayVersionSize);
+  WCHAR currentBuild[512];
+  DWORD currentBuildSize = sizeof(currentBuild);
+  resultRegistry = RegQueryValueEx(registryKey, L"CurrentBuild", 0, NULL, (LPBYTE)currentBuild,
+                                   &currentBuildSize);
+  DWORD UBR[1];
+  DWORD UBRSize = sizeof(UBR);
+  resultRegistry = RegQueryValueEx(registryKey, L"UBR", 0, NULL, (LPBYTE)UBR, &UBRSize);
 
   std::wstring osProductStr = osProduct;
-  std::wstring releaseIdStr = releaseId;
-  std::wstring buildLabExStr = buildLabEx;
+  std::wstring displayVersionStr = displayVersion;
+  std::wstring currentBuildStr = currentBuild;
+  std::wstring ubrStr = std::to_wstring(UBR[0]);
 
-  specs_.os = "\"" + std::string(osProductStr.begin(), osProductStr.end()) + " " +
-              std::string(releaseIdStr.begin(), releaseIdStr.end()) + " (OS Build " +
-              std::string(buildLabExStr.begin(), buildLabExStr.end()) + ")\"";
+  if (std::stoi(currentBuildStr) > 20000) { // Windows 10: 19xxx; Windows 11: 22xxx
+    osProductStr.replace(osProductStr.find(L"10"), sizeof("10") - 1, L"11");
+  }
+
+  specs_.os = "\"" + ConvertUTF16StringToUTF8String(osProductStr) + " " +
+              ConvertUTF16StringToUTF8String(displayVersionStr) + " OS Build " +
+              ConvertUTF16StringToUTF8String(currentBuildStr) + "." + 
+              ConvertUTF16StringToUTF8String(ubrStr) + "\"";
 
   if (specs_.motherboard == "\"\"" || specs_.motherboard.empty()) {
     resultRegistry = RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"HARDWARE\\DESCRIPTION\\System\\BIOS", 0,
@@ -297,8 +310,9 @@ void Recording::ReadRegistry()
 	std::wstring manufacturerStr = manufacturer;
     std::wstring productStr = product;
 
-    specs_.motherboard = "\"" + std::string(manufacturerStr.begin(), manufacturerStr.end()) +
-                         std::string(productStr.begin(), productStr.end()) + "\"";
+    specs_.motherboard =
+        "\"" + ConvertUTF16StringToUTF8String(manufacturerStr) +
+        ConvertUTF16StringToUTF8String(productStr) + "\"";
   }
 }
 
@@ -371,38 +385,81 @@ void Recording::GetGPUsInfo()
       NvAPI_Unload();
     }
     else {
-      // Intel
-      // only detects primary graphics driver
-      uint32_t vendorId, deviceId;
-      uint64_t videoMemory;
-      std::wstring GFXBrand;
-      if (getGraphicsDeviceInfo(&vendorId, &deviceId, &videoMemory, &GFXBrand)) {
-        specs_.driverVersionBasic = "-";
-        specs_.driverVersionDetail = "-";
+      // Intel - GPUDetect - TestMain.cpp
+
+      ////////////////////////////////////////////////////////////////////////////////
+      // Copyright 2017-2018 Intel Corporation
+      //
+      // Licensed under the Apache License, Version 2.0 (the "License");
+      // you may not use this file except in compliance with the License.
+      // You may obtain a copy of the License at
+      //
+      // http://www.apache.org/licenses/LICENSE-2.0
+      //
+      // Unless required by applicable law or agreed to in writing, software
+      // distributed under the License is distributed on an "AS IS" BASIS,
+      // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      // See the License for the specific language governing permissions and
+      // limitations under the License.
+      ////////////////////////////////////////////////////////////////////////////////
+      
+        // defaults to adapter #0
+      IDXGIAdapter* adapter = nullptr;
+      int initReturnCode = GPUDetect::InitAdapter(&adapter, 0);
+      if (initReturnCode != EXIT_SUCCESS) {
+        return;
+      };
+
+      ID3D11Device* device = nullptr;
+      initReturnCode = GPUDetect::InitDevice(adapter, &device);
+      if (initReturnCode != EXIT_SUCCESS) {
+        adapter->Release();
+        return;
+      };
+
+      GPUDetect::GPUData gpuData = {};
+      initReturnCode = GPUDetect::InitExtensionInfo(&gpuData, adapter, device);
+      if (initReturnCode == EXIT_SUCCESS) {
         specs_.gpuCount = 1;
         GPU gpu = {};
-        gpu.name = ConvertUTF16StringToUTF8String(GFXBrand);
-        gpu.totalMemory = static_cast<int>(videoMemory / (1024 * 1024));
-
-        if (vendorId == INTEL_VENDOR_ID) {
-          IntelDeviceInfoHeader intelDeviceInfoHeader = {0};
-          unsigned char intelDeviceInfoBuffer[1024];
-          if (GGF_SUCCESS ==
-              getIntelDeviceInfo(vendorId, &intelDeviceInfoHeader, &intelDeviceInfoBuffer)) {
-            if (intelDeviceInfoHeader.Version == 2) {
-              IntelDeviceInfoV2 intelDeviceInfo;
-              memcpy(&intelDeviceInfo, intelDeviceInfoBuffer, intelDeviceInfoHeader.Size);
-              gpu.coreClock = intelDeviceInfo.GPUMaxFreq;
-            }
-            else if (intelDeviceInfoHeader.Version == 1) {
-              IntelDeviceInfoV1 intelDeviceInfo;
-              memcpy(&intelDeviceInfo, intelDeviceInfoBuffer, intelDeviceInfoHeader.Size);
-              gpu.coreClock = intelDeviceInfo.GPUMaxFreq;
-            }
+
+        gpu.name = ConvertUTF16StringToUTF8String(gpuData.description);
+        gpu.totalMemory = (int)(gpuData.videoMemory / (1024 * 1024));
+
+        //  Find and print driver version information
+        //
+        initReturnCode = GPUDetect::InitDxDriverVersion(&gpuData);
+        if (gpuData.d3dRegistryDataAvailability) {
+          char driverVersion[19] = {};
+          GPUDetect::GetDriverVersionAsCString(&gpuData, driverVersion, _countof(driverVersion));
+
+          specs_.driverVersionBasic = driverVersion;
+          specs_.driverVersionDetail = std::to_string(gpuData.driverInfo.driverReleaseRevision);
+        }
+        else {
+          specs_.driverVersionBasic = "-";
+          specs_.driverVersionDetail = "-";
+        }
+
+        if (gpuData.vendorID == GPUDetect::INTEL_VENDOR_ID) {
+          //
+          // In DirectX, Intel exposes additional information through the driver that can be
+          // obtained querying a special DX counter
+          //
+
+          // Populate the GPU architecture data with info from the counter, otherwise gpuDetect will
+          // use the value we got from the Dx11 extension
+          initReturnCode = GPUDetect::InitCounterInfo(&gpuData, device);
+          if (initReturnCode == EXIT_SUCCESS) {
+            gpu.coreClock = gpuData.maxFrequency;
           }
         }
+        // Intel - GPUDetect
+
         specs_.gpus.push_back(gpu);
       }
+      device->Release();
+      adapter->Release();
     }
   }
 }
@@ -417,7 +474,7 @@ void Recording::PopulateSystemSpecs()
   // Registry information - CPU and OS and if needed, Motherboard
   ReadRegistry();
 
-  // GPU information - AGS or NvAPI
+  // GPU information - AGS or NvAPI or GPUDetect
   GetGPUsInfo();
 }
 
diff --git a/UWPDebug/UWPDebug.vcxproj b/UWPDebug/UWPDebug.vcxproj
index 2e77a6d..a9c8716 100644
--- a/UWPDebug/UWPDebug.vcxproj
+++ b/UWPDebug/UWPDebug.vcxproj
@@ -14,21 +14,21 @@
     <ProjectGuid>{221E3F5C-9504-4505-810E-578B4EEE6E35}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>UWPDebug</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/UWPOverlay/UWPOverlay.vcxproj b/UWPOverlay/UWPOverlay.vcxproj
index 9fbfc39..144ac77 100644
--- a/UWPOverlay/UWPOverlay.vcxproj
+++ b/UWPOverlay/UWPOverlay.vcxproj
@@ -14,21 +14,21 @@
     <ProjectGuid>{DECC266D-25DF-44DC-93CB-DDAF69EC1D71}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>UWPOverlay</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/LibOVR/Include/Extras/OVR_CAPI_Util.h b/VR/LibOVR/Include/Extras/OVR_CAPI_Util.h
similarity index 100%
rename from LibOVR/Include/Extras/OVR_CAPI_Util.h
rename to VR/LibOVR/Include/Extras/OVR_CAPI_Util.h
diff --git a/LibOVR/Include/Extras/OVR_Math.h b/VR/LibOVR/Include/Extras/OVR_Math.h
similarity index 100%
rename from LibOVR/Include/Extras/OVR_Math.h
rename to VR/LibOVR/Include/Extras/OVR_Math.h
diff --git a/LibOVR/Include/Extras/OVR_StereoProjection.h b/VR/LibOVR/Include/Extras/OVR_StereoProjection.h
similarity index 100%
rename from LibOVR/Include/Extras/OVR_StereoProjection.h
rename to VR/LibOVR/Include/Extras/OVR_StereoProjection.h
diff --git a/LibOVR/Include/OVR_CAPI.h b/VR/LibOVR/Include/OVR_CAPI.h
similarity index 100%
rename from LibOVR/Include/OVR_CAPI.h
rename to VR/LibOVR/Include/OVR_CAPI.h
diff --git a/LibOVR/Include/OVR_CAPI_Audio.h b/VR/LibOVR/Include/OVR_CAPI_Audio.h
similarity index 100%
rename from LibOVR/Include/OVR_CAPI_Audio.h
rename to VR/LibOVR/Include/OVR_CAPI_Audio.h
diff --git a/LibOVR/Include/OVR_CAPI_D3D.h b/VR/LibOVR/Include/OVR_CAPI_D3D.h
similarity index 100%
rename from LibOVR/Include/OVR_CAPI_D3D.h
rename to VR/LibOVR/Include/OVR_CAPI_D3D.h
diff --git a/LibOVR/Include/OVR_CAPI_GL.h b/VR/LibOVR/Include/OVR_CAPI_GL.h
similarity index 100%
rename from LibOVR/Include/OVR_CAPI_GL.h
rename to VR/LibOVR/Include/OVR_CAPI_GL.h
diff --git a/LibOVR/Include/OVR_CAPI_Keys.h b/VR/LibOVR/Include/OVR_CAPI_Keys.h
similarity index 100%
rename from LibOVR/Include/OVR_CAPI_Keys.h
rename to VR/LibOVR/Include/OVR_CAPI_Keys.h
diff --git a/LibOVR/Include/OVR_CAPI_Vk.h b/VR/LibOVR/Include/OVR_CAPI_Vk.h
similarity index 100%
rename from LibOVR/Include/OVR_CAPI_Vk.h
rename to VR/LibOVR/Include/OVR_CAPI_Vk.h
diff --git a/LibOVR/Include/OVR_ErrorCode.h b/VR/LibOVR/Include/OVR_ErrorCode.h
similarity index 100%
rename from LibOVR/Include/OVR_ErrorCode.h
rename to VR/LibOVR/Include/OVR_ErrorCode.h
diff --git a/LibOVR/Include/OVR_Version.h b/VR/LibOVR/Include/OVR_Version.h
similarity index 100%
rename from LibOVR/Include/OVR_Version.h
rename to VR/LibOVR/Include/OVR_Version.h
diff --git a/openvr/headers/openvr.h b/VR/openvr/headers/openvr.h
similarity index 100%
rename from openvr/headers/openvr.h
rename to VR/openvr/headers/openvr.h
diff --git a/Wrapper/Wrapper.cpp b/Wrapper/Wrapper.cpp
index 54298f4..19decae 100644
--- a/Wrapper/Wrapper.cpp
+++ b/Wrapper/Wrapper.cpp
@@ -87,11 +87,12 @@ Wrapper::OverlayWrapper::~OverlayWrapper()
   delete overlayInterface_;
 }
 
-void Wrapper::OverlayWrapper::StartCaptureExe(String^ exe, String^ cmdArgs)
+void Wrapper::OverlayWrapper::StartCaptureExe(String^ exe, String^ workingDirectory, String^ cmdArgs)
 {
   std::wstring exeW = msclr::interop::marshal_as<std::wstring>(exe);
+  std::wstring workingDirectoryW = msclr::interop::marshal_as<std::wstring>(workingDirectory);
   std::wstring cmdArgsW = msclr::interop::marshal_as<std::wstring>(cmdArgs);
-  overlayInterface_->StartProcess(exeW, cmdArgsW);
+  overlayInterface_->StartProcess(exeW, workingDirectoryW, cmdArgsW);
 }
 
 void Wrapper::OverlayWrapper::StartCaptureAll()
diff --git a/Wrapper/Wrapper.h b/Wrapper/Wrapper.h
index 9adf7df..84e26d9 100644
--- a/Wrapper/Wrapper.h
+++ b/Wrapper/Wrapper.h
@@ -59,7 +59,7 @@ ref class OverlayWrapper {
 
   bool Init(IntPtr hwnd);
 
-  void StartCaptureExe(String^ exe, String^ cmdArgs);
+  void StartCaptureExe(String^ exe, String^ workingDirectory, String^ cmdArgs);
   void StartCaptureAll();
 
   bool ProcessFinished();
diff --git a/Wrapper/Wrapper.vcxproj b/Wrapper/Wrapper.vcxproj
index ff9e673..ddb6d84 100644
--- a/Wrapper/Wrapper.vcxproj
+++ b/Wrapper/Wrapper.vcxproj
@@ -15,7 +15,7 @@
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>Wrapper</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -23,7 +23,7 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <CLRSupport>true</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -31,7 +31,7 @@
     <CLRSupport>true</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/docs/source/build.rst b/docs/source/build.rst
index 36cdd7e..90e8b9a 100644
--- a/docs/source/build.rst
+++ b/docs/source/build.rst
@@ -10,7 +10,7 @@ Prerequisites
 - `.NET 4.5 <https://www.microsoft.com/en-us/download/details.aspx?id=30653>`_
 - `WiX Toolset 3.11 <http://wixtoolset.org/>`_
 
-OCAT Version 1.6.1 builds against Vulkan SDK 1.2.154.1.
+OCAT Version 1.6.2 builds against Vulkan SDK 1.2.182.0.
 
 Build
 -----
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index 696fbd7..99e4f10 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -1,6 +1,25 @@
 Changelog
 =========
 
+1.6.2 - 2021-12-21
+----------------
+
+Added
+^^^^^
+
+- Option to set working directory when launching app from within OCAT
+
+Changed
+^^^^^^^
+
+- Updated Windows SDK and Vulkan SDK
+- Updated GPUDetect
+
+Fixed
+^^^^^
+
+- Fixed several bugs that affected overlay compatibility with a number of games
+
 1.6.1 - 2020-12-07
 ----------------
 
@@ -9,7 +28,7 @@ Added
 
 - Support for RDNA and RDNA2 GPUs
 
-  - Updated AGS to 1.6
+  - Updated AGS to v6.0
 
 - Resolution information gets also retrieved in window mode now
 
diff --git a/docs/source/usage.rst b/docs/source/usage.rst
index ab6b691..9a7981f 100644
--- a/docs/source/usage.rst
+++ b/docs/source/usage.rst
@@ -36,6 +36,7 @@ Launch App
 Allows you to inject the overlay into a single application. Once the application and the command line parameters have been selected, press :guilabel:`Start Application` to run it.
 
   * :guilabel:`Select target executable` Opens a file dialog to select an executable file that should be started with the OCAT overlay. It is possible to start a UWP app but the overlay will not react to key input. The capture will work correctly.
+  * :guilabel:`Select working directory` Opens a folder dialog to select a folder that should be used as working directory for the executable.
   * :guilabel:`Commandline arguments` Additional command line arguments to start the executable with.
   * use **steam://run/<AppId>** as a command line argument to prevent the game restarting via the Steam client. Make sure the Steam AppId is the correct one for the selected application and that the Steam client is running.
 
@@ -111,13 +112,13 @@ If an entry for a provider set is missing, it is by default enabled and uses the
 On the first run, OCAT will generate a ``captureConfig.json`` file. To restore the default settings, delete the capture config file. A new one will be generated on the next run.
 The capture detail options are :kbd:`Simple`, :kbd:`Normal` and :kbd:`Verbose`.
 
-Blacklist
+Denylist
 ---------
 
-Applications can be excluded from DLL-Injection through blacklisting based on the executable name. The blacklists, a default and a user blacklist, can be found in ``Documents\OCAT\Config``.
-The default blacklist is named ``defaultBlackList.txt``. The user blacklist that you can edit is called ``userBlackList.txt``
-All processes on the blacklists don't show the overlay, and no captures are created. On the first run, OCAT will generate or update the default blacklist and generate a dummy user blacklist for you to start editing.
-You should add executables to the user blacklist to make sure they won't get overwritten when OCAT is updated. Each line must contain one executable name (case insensitive).
+Applications can be excluded from DLL-Injection through the denylist based on the executable name. The denylists, a default and a user denylist, can be found in ``Documents\OCAT\Config``.
+The default denylist is named ``defaultDenyList.txt``. The user denylist that you can edit is called ``userDenyList.txt``
+All processes on the denylists don't show the overlay, and no captures are created. On the first run, OCAT will generate or update the default denylist and generate a dummy user denylist for you to start editing.
+You should add executables to the user denylist to make sure they won't get overwritten when OCAT is updated. Each line must contain one executable name (case insensitive).
 
 Logs
 ---------
diff --git a/gpudetect/DeviceId.cpp b/gpudetect/DeviceId.cpp
deleted file mode 100644
index 12b3f75..0000000
--- a/gpudetect/DeviceId.cpp
+++ /dev/null
@@ -1,491 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////////////////
-// Copyright 2017 Intel Corporation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-//
-// DeviceId.cpp : Implements the GPU Device detection and graphics settings
-//                configuration functions.
-//
-
-#include <wrl.h>
-#include "DeviceId.h"
-#include <stdio.h>
-#include <string>
-
-#include <InitGuid.h>
-#include <D3D11.h>
-#include <D3DCommon.h>
-#ifdef _WIN32_WINNT_WIN10 
-#include <DXGI1_4.h>
-#include <d3d11_3.h>
-#else
-#include <DXGI1_3.h>
-#endif
-
-#include <oleauto.h>
-#include <wbemidl.h>
-#include <ObjBase.h>
-
-/*****************************************************************************************
- * getGraphicsDeviceInfo
- *
- *     Function to retrieve information about the primary graphics driver. This includes
- *     the device's Vendor ID, Device ID, and available memory.
- *
- *****************************************************************************************/
-
-bool getGraphicsDeviceInfo( unsigned int* VendorId,
-							unsigned int* DeviceId,
-							unsigned __int64* VideoMemory,
-							std::wstring* GFXBrand)
-{
-	if ((VendorId == NULL) || (DeviceId == NULL)) {
-		return false;
-	}
-
-	//
-	// DXGI is supported on Windows Vista and later. Define a function pointer to the
-	// CreateDXGIFactory function. DXGIFactory1 is supported by Windows Store Apps so
-	// try that first.
-	//
-	HMODULE hDXGI = LoadLibrary(L"dxgi.dll");
-	if (hDXGI == NULL) {
-		return false;
-	}
-
-	typedef HRESULT(WINAPI*LPCREATEDXGIFACTORY)(REFIID riid, void** ppFactory);
-
-	LPCREATEDXGIFACTORY pCreateDXGIFactory = (LPCREATEDXGIFACTORY)GetProcAddress(hDXGI, "CreateDXGIFactory1");
-	if (pCreateDXGIFactory == NULL) {
-		pCreateDXGIFactory = (LPCREATEDXGIFACTORY)GetProcAddress(hDXGI, "CreateDXGIFactory");
-
-		if (pCreateDXGIFactory == NULL) {
-			FreeLibrary(hDXGI);
-			return false;
-		}
-	}
-
-	//
-	// We have the CreateDXGIFactory function so use it to actually create the factory and enumerate
-	// through the adapters. Here, we are specifically looking for the Intel gfx adapter. 
-	//
-	IDXGIAdapter*     pAdapter;
-	IDXGIFactory*     pFactory;
-	DXGI_ADAPTER_DESC AdapterDesc;
-	if (FAILED((*pCreateDXGIFactory)(__uuidof(IDXGIFactory), (void**)(&pFactory)))) {
-		FreeLibrary(hDXGI);
-		return false;
-	}
-
-	if (FAILED(pFactory->EnumAdapters(0, (IDXGIAdapter**)&pAdapter))) {
-		FreeLibrary(hDXGI);
-		return false;
-	}
-
-	unsigned int intelAdapterIndex = 0;
-	while (pFactory->EnumAdapters(intelAdapterIndex, &pAdapter) != DXGI_ERROR_NOT_FOUND) {
-		pAdapter->GetDesc(&AdapterDesc);
-		if (AdapterDesc.VendorId == 0x8086) {
-			break;
-		}
-		intelAdapterIndex++;
-	}
-
-	if (pAdapter == NULL) {
-		FreeLibrary(hDXGI);
-		return false;
-	}
-	*VendorId = AdapterDesc.VendorId;
-	*DeviceId = AdapterDesc.DeviceId;
-	*GFXBrand = AdapterDesc.Description;
-
-	//
-	// On UMA hardware like Intel iGPUs, all graphics memory is shared. The dedicated
-	// value is populated by a default 128 dummy value in Intel drivers to prevent crashes in 
-	// legacy apps which aren't aware of UMA hardware (other vendors may use a different threshold). 
-	//
-	// If we are using DX11.3 the FeatureDataOptions2 interface should be available. Checking the UMA flag 
-	// is recommended over comparing dedicated against a UMA threshold users can regedit override.
-	//
-	HRESULT hr = E_FAIL;
-	*VideoMemory = 0;
-
-#ifdef _WIN32_WINNT_WIN10
-	Microsoft::WRL::ComPtr<ID3D11Device> pDevice = NULL;
-	Microsoft::WRL::ComPtr<ID3D11DeviceContext> pImmediateContext = NULL;
-	D3D_FEATURE_LEVEL featureLevel;
-	ZeroMemory(&featureLevel, sizeof(D3D_FEATURE_LEVEL));
-			
-	if (SUCCEEDED(D3D11CreateDevice(pAdapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, NULL, NULL, NULL,
-		D3D11_SDK_VERSION, &pDevice, &featureLevel, &pImmediateContext))) {
-
-		D3D11_FEATURE_DATA_D3D11_OPTIONS2 FeatureData;
-		ZeroMemory(&FeatureData, sizeof(FeatureData));
-		Microsoft::WRL::ComPtr<ID3D11Device3> pDevice3;
-
-		//
-		// Set the maximum available video memory
-		//
-		if (SUCCEEDED(pDevice->QueryInterface(__uuidof(ID3D11Device3), (void**)&pDevice3))) {
-			if (SUCCEEDED(pDevice3->CheckFeatureSupport(D3D11_FEATURE_D3D11_OPTIONS2, &FeatureData, sizeof(FeatureData)))) {
-				*VideoMemory = (unsigned __int64)((FeatureData.UnifiedMemoryArchitecture == FALSE) ?
-					AdapterDesc.DedicatedVideoMemory : AdapterDesc.SharedSystemMemory);
-			}
-		}
-	}
-#endif // _WIN32_WINNT_WIN10
-
-	if (hr == E_FAIL || *VideoMemory <= 0) // Pre-DX11.3 fallback
-	{
-		//
-		// We check whether dedicated is greater than a threshold to determine if we're on a UMA GPU.
-		// NOTE: This isn't 100% foolproof. Users can override this value to anywhere from 0 and 512MB 
-		// with the reg key: HKEY_LOCAL_MACHINE\Software\Intel\GMM\DedicatedSegmentSize
-		//
-		const int ASSUME_UMA_THRESHOLD = 512 * (1024 * 1024);
-		*VideoMemory = (unsigned __int64)((AdapterDesc.DedicatedVideoMemory >= ASSUME_UMA_THRESHOLD) ?
-			AdapterDesc.DedicatedVideoMemory : AdapterDesc.SharedSystemMemory);
-	}
-
-	pAdapter->Release();
-	FreeLibrary(hDXGI);
-	return true;
-}
-
-/******************************************************************************************************************************************
- * getIntelDeviceInfo
- *
- * Description:
- *       Gets device information which is stored in a D3D counter. First, a D3D device must be created, the Intel counter located, and
- *       finally queried.
- *
- *       Supported device info: GPU Max Frequency, GPU Min Frequency, GT Generation, EU Count, Package TDP, Max Fill Rate
- * 
- * Parameters:
- *         unsigned int VendorId                         - [in]     - Input:  system's vendor id
- *         IntelDeviceInfoHeader *pIntelDeviceInfoHeader - [in/out] - Input:  allocated IntelDeviceInfoHeader *
- *                                                                    Output: Intel device info header, if found
- *         void *pIntelDeviceInfoBuffer                  - [in/out] - Input:  allocated void *
- *                                                                    Output: IntelDeviceInfoV[#], cast based on IntelDeviceInfoHeader
- * Return:
- *         GGF_SUCCESS: Able to find Data is valid
- *         GGF_E_UNSUPPORTED_HARDWARE: Unsupported hardware, data is invalid
- *         GGF_E_UNSUPPORTED_DRIVER: Unsupported driver on Intel, data is invalid
- *
- *****************************************************************************************************************************************/
-
-long getIntelDeviceInfo( unsigned int VendorId, IntelDeviceInfoHeader *pIntelDeviceInfoHeader, void *pIntelDeviceInfoBuffer )
-{
-	if ( pIntelDeviceInfoBuffer == NULL ) {
-		return GGF_ERROR;
-	}
-
-	if ( VendorId != INTEL_VENDOR_ID ) {
-		return GGF_E_UNSUPPORTED_HARDWARE;
-	}
-
-	//
-	// First create the Device, must be SandyBridge or later to create D3D11 device
-	//
-	Microsoft::WRL::ComPtr<ID3D11Device> pDevice = NULL;
-	Microsoft::WRL::ComPtr<ID3D11DeviceContext> pImmediateContext = NULL;
-	HRESULT hr = NULL;
-
-	hr = D3D11CreateDevice( NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, NULL, NULL, NULL,
-							D3D11_SDK_VERSION, &pDevice, NULL, &pImmediateContext);
-
-	if ( FAILED(hr) )
-	{
-		printf("D3D11CreateDevice failed\n");
-
-		return GGF_ERROR;
-	}
-	
-	//
-	// Query the device to find the number of device dependent counters. If LastDeviceDependentCounter
-	// is 0 then there are no device dependent counters supported on this device.
-	//
-	D3D11_COUNTER_INFO counterInfo;
-	int numDependentCounters;
-
-	ZeroMemory( &counterInfo, sizeof(D3D11_COUNTER_INFO) );
-
-	pDevice->CheckCounterInfo( &counterInfo );
-
-	if ( counterInfo.LastDeviceDependentCounter == 0 )
-	{
-		printf("No device dependent counters\n");
-
-		return GGF_E_UNSUPPORTED_DRIVER;
-	}
-
-	numDependentCounters = (counterInfo.LastDeviceDependentCounter - D3D11_COUNTER_DEVICE_DEPENDENT_0) + 1;
-
-	//
-	// Since there is at least 1 counter, we search for the apporpriate counter - INTEL_DEVICE_INFO_COUNTERS
-	//
-	D3D11_COUNTER_DESC pIntelCounterDesc;
-	UINT uiSlotsRequired, uiNameLength, uiUnitsLength, uiDescLength;
-	LPSTR sName, sUnits, sDesc;
-
-	ZeroMemory(&pIntelCounterDesc, sizeof(D3D11_COUNTER_DESC));
-	
-	for ( int i = 0; i < numDependentCounters; ++i )
-	{
-		D3D11_COUNTER_DESC counterDescription;
-		D3D11_COUNTER_TYPE counterType;
-
-		counterDescription.Counter = static_cast<D3D11_COUNTER>(i + D3D11_COUNTER_DEVICE_DEPENDENT_0);
-		counterDescription.MiscFlags = 0;
-		uiSlotsRequired = uiNameLength = uiUnitsLength = uiDescLength = 0;
-		sName = sUnits = sDesc = NULL;
-
-		if( SUCCEEDED( hr = pDevice->CheckCounter( &counterDescription, &counterType, &uiSlotsRequired, NULL, &uiNameLength, NULL, &uiUnitsLength, NULL, &uiDescLength ) ) )
-		{
-			if (uiNameLength == 0 || uiUnitsLength == 0 || uiDescLength == 0)
-			{
-				return GGF_ERROR;
-			}
-
-			LPSTR sName  = new char[uiNameLength];
-			LPSTR sUnits = new char[uiUnitsLength];
-			LPSTR sDesc  = new char[uiDescLength];
-			
-			if( SUCCEEDED( hr = pDevice->CheckCounter( &counterDescription, &counterType, &uiSlotsRequired, sName, &uiNameLength, sUnits, &uiUnitsLength, sDesc, &uiDescLength ) ) )
-			{
-				if ( strcmp( sName, INTEL_DEVICE_INFO_COUNTERS ) == 0 )
-				{
-					int IntelCounterMajorVersion = 0;
-					int IntelCounterSize = 0;
-
-					pIntelCounterDesc.Counter = counterDescription.Counter;
-
-					sscanf_s( sDesc, "Version %d", &IntelCounterMajorVersion);
-					
-					if (IntelCounterMajorVersion == 2 )
-					{
-						IntelCounterSize = sizeof( IntelDeviceInfoV2 );
-					}
-					else // Fall back to version 1.0
-					{
-						IntelCounterMajorVersion = 1;
-						IntelCounterSize = sizeof( IntelDeviceInfoV1 );
-					}
-
-					pIntelDeviceInfoHeader->Version = IntelCounterMajorVersion;
-					pIntelDeviceInfoHeader->Size = IntelCounterSize;
-				}
-			}
-			
-			delete[] sName;
-			delete[] sUnits;
-			delete[] sDesc;
-		}
-	}
-
-	//
-	// Check if the Device Info Counter was found. If not, then it means
-	// the driver doesn't support this counter.
-	//
-	if ( pIntelCounterDesc.Counter == NULL )
-	{
-		printf("Could not find counter\n");
-
-		return GGF_E_UNSUPPORTED_DRIVER;
-	}
-	
-	//
-	// Now we know the driver supports the counter we are interested in. So create it and
-	// capture the data we want.
-	//
-	Microsoft::WRL::ComPtr<ID3D11Counter> pIntelCounter = NULL;
-
-	hr = pDevice->CreateCounter(&pIntelCounterDesc, &pIntelCounter);
-	if ( FAILED(hr) )
-	{
-		printf("CreateCounter failed\n");
-
-		return GGF_E_D3D_ERROR;
-	}
-
-	pImmediateContext->Begin(pIntelCounter.Get());
-	pImmediateContext->End(pIntelCounter.Get());
-
-	hr = pImmediateContext->GetData( pIntelCounter.Get(), NULL, 0, 0 );
-	if ( FAILED(hr) || hr == S_FALSE )
-	{
-		printf("Getdata failed \n");
-
-		return GGF_E_D3D_ERROR;
-	}
-	
-	//
-	// GetData will return the address of the data, not the actual data.
-	//
-	DWORD pData[2] = {0};
-	hr = pImmediateContext->GetData(pIntelCounter.Get(), pData, 2 * sizeof(DWORD), 0);
-	if ( FAILED(hr) || hr == S_FALSE )
-	{
-		printf("Getdata failed \n");
-		return GGF_E_D3D_ERROR;
-	}
-
-	//
-	// Copy data to passed in parameter and clean up
-	//
-	void *pDeviceInfoBuffer = *(void**)pData;
-	memcpy( pIntelDeviceInfoBuffer, pDeviceInfoBuffer, pIntelDeviceInfoHeader->Size );
-
-	return GGF_SUCCESS;
-}
-
-/*****************************************************************************************
-* getCPUInfo
-*
-*      Parses CPUID output to find the brand and vendor strings.
-*
-*****************************************************************************************/
-
-void getCPUInfo(std::string* cpubrand, std::string* cpuvendor)
-{
-
-	// Get extended ids.
-	int CPUInfo[4] = { -1 };
-	__cpuid(CPUInfo, 0x80000000);
-	unsigned int nExIds = CPUInfo[0];
-
-	// Get the information associated with each extended ID.
-	char CPUBrandString[0x40] = { 0 };
-	char CPUVendorString[0x40] = { 0 };
-
-	__cpuid(CPUInfo, 0);
-	memcpy_s(CPUVendorString, sizeof(CPUInfo), &CPUInfo[1], sizeof(int));
-	memcpy_s(CPUVendorString + 4, sizeof(CPUInfo), &CPUInfo[3], sizeof(int));
-	memcpy_s(CPUVendorString + 8, sizeof(CPUInfo), &CPUInfo[2], sizeof(int));
-	*cpuvendor = CPUVendorString;
-
-	for (unsigned int i = 0x80000000; i <= nExIds; ++i)
-	{
-		__cpuid(CPUInfo, i);
-
-		if (i == 0x80000002)
-		{
-
-			memcpy_s(CPUBrandString, sizeof(CPUInfo), CPUInfo, 4 * sizeof(int));
-		}
-		else if (i == 0x80000003)
-		{
-			memcpy_s(CPUBrandString + 16, sizeof(CPUInfo), CPUInfo, 4 * sizeof(int));
-		}
-		else if (i == 0x80000004)
-		{
-			memcpy_s(CPUBrandString + 32, sizeof(CPUInfo), CPUInfo, 4 * sizeof(int));
-		}
-	}
-	*cpubrand = CPUBrandString;
-
-}
-
-/*****************************************************************************************
-* getGTGeneration
-*
-*      Returns the generation by parsing the device id. The first two digits of the hex
-*      number generally denote the generation. Sandybridge and Ivybridge share the same
-*      numbers so they must be further parsed.
-*
-*      Comparison of the deviceIds (for example to see if a device is more recent than
-*      another) does not always work.
-*
-*****************************************************************************************/
-
-PRODUCT_FAMILY getGTGeneration(unsigned int deviceId)
-{
-	unsigned int maskedDeviceId = deviceId & 0xFF00;
-
-	//
-	// Device is Sandybridge or Ivybridge
-	//
-	if (maskedDeviceId == 0x0100) {
-		if ( 
-			((deviceId & 0x0050) == 0x0050) ||
-			((deviceId & 0x0060) == 0x0060)
-		   ) {
-			return IGFX_IVYBRIDGE;
-			}
-		if (
-			((deviceId & 0x0010) == 0x0010) ||
-			((deviceId & 0x00F0) == 0x0000)
-			) {
-			return IGFX_SANDYBRIDGE;
-		}
-	}
-
-	if (maskedDeviceId == 0x0400 || maskedDeviceId == 0x0A00 || maskedDeviceId == 0x0D00) {
-		return IGFX_HASWELL;
-	}
-
-	if (maskedDeviceId == 0x1600) {
-		return IGFX_BROADWELL;
-	}
-
-	if (maskedDeviceId == 0x1900) {
-		return IGFX_SKYLAKE;
-	}
-	
-	if (maskedDeviceId == 0x5900) {
-		return IGFX_KABYLAKE;
-	}
-
-	if (maskedDeviceId == 0x3E00) {
-		return IGFX_COFFEELAKE;
-	}
-	
-	return IGFX_UNKNOWN;
-}
-
-#include "ID3D10Extensions.h"
-UINT checkDxExtensionVersion( )
-{
-    UINT extensionVersion = 0;
-    ID3D10::CAPS_EXTENSION intelExtCaps;
-    Microsoft::WRL::ComPtr<ID3D11Device> pDevice = NULL;
-	Microsoft::WRL::ComPtr<ID3D11DeviceContext> pImmediateContext = NULL;
-	D3D_FEATURE_LEVEL featureLevel;
-	HRESULT hr = NULL;
-
-	ZeroMemory( &featureLevel, sizeof(D3D_FEATURE_LEVEL) );
-
-	ID3D11DeviceContext **pContext = &pImmediateContext;
-
-	// First create the Device
-	hr = D3D11CreateDevice( NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, NULL, NULL, NULL,
-							D3D11_SDK_VERSION, &pDevice, &featureLevel, &pImmediateContext);
-
-	if ( FAILED(hr) )
-	{
-		printf("D3D11CreateDevice failed\n");
-	}
-	ZeroMemory( &intelExtCaps, sizeof(ID3D10::CAPS_EXTENSION) );
-
-	if ( pDevice )
-	{
-		if( S_OK == GetExtensionCaps( pDevice.Get(), &intelExtCaps ) )
-		{
-			extensionVersion = intelExtCaps.DriverVersion;
-		}
-	}
-
-	return extensionVersion;
-}
\ No newline at end of file
diff --git a/gpudetect/DeviceId.h b/gpudetect/DeviceId.h
deleted file mode 100644
index f7f8c8d..0000000
--- a/gpudetect/DeviceId.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////////////////
-// Copyright 2017 Intel Corporation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-//
-// DeviceId.h
-//
-#pragma once
-
-#include <windows.h>
-#include <string>
-
-#define INTEL_VENDOR_ID 0x8086
-
-typedef enum
-{ 
-    IGFX_UNKNOWN     = 0x0, 
-    IGFX_SANDYBRIDGE = 0xC, 
-    IGFX_IVYBRIDGE,    
-    IGFX_HASWELL,
-	IGFX_VALLEYVIEW,
-	IGFX_BROADWELL,
-	IGFX_SKYLAKE,
-	IGFX_KABYLAKE,
-	IGFX_COFFEELAKE
-} PRODUCT_FAMILY;
-
-//
-// Device dependent counter and associated data structures
-//
-#define INTEL_DEVICE_INFO_COUNTERS         "Intel Device Information"
-
-struct IntelDeviceInfoV1
-{
-    DWORD GPUMaxFreq;
-    DWORD GPUMinFreq;
-};
-
-struct IntelDeviceInfoV2
-{
-	DWORD GPUMaxFreq;
-	DWORD GPUMinFreq;
-	DWORD GTGeneration;
-	DWORD EUCount;
-	DWORD PackageTDP;
-	DWORD MaxFillRate;
-};
-
-struct IntelDeviceInfoHeader
-{
-	DWORD Size;
-	DWORD Version;
-};
-
-/*****************************************************************************************
- * getGraphicsDeviceInfo
- *
- *     Function to get the primary graphics device's Vendor ID and Device ID, either 
- *     through the new DXGI interface or through the older D3D9 interfaces.
- *     The function also returns the amount of memory availble for graphics using 
- *     the value shared + dedicated video memory returned from DXGI, or, if the DXGI
- *	   interface is not available, the amount of memory returned from WMI.
- *
- *****************************************************************************************/
-
-bool getGraphicsDeviceInfo( unsigned int* VendorId,
-                          unsigned int* DeviceId,
-						  unsigned __int64* VideoMemory,
-						  std::wstring* GFXBrand);
-
-/*****************************************************************************************
- * getIntelDeviceInfo
- *
- *     Returns the device info:
- *       GPU Max Frequency (Mhz)
- *       GPU Min Frequency (Mhz)
- *       GT Generation (enum)
- *       EU Count (unsigned int)
- *       Package TDP (Watts)
- *       Max Fill Rate (Pixel/Clk)
- * 
- * A return value of GGF_SUCCESS indicates 
- *	   the frequency was returned correctly. 
- *     This function is only valid on Intel graphics devices SNB and later.
- *****************************************************************************************/
-
-long getIntelDeviceInfo( unsigned int VendorId, IntelDeviceInfoHeader *pIntelDeviceInfoHeader, void *pIntelDeviceInfoBuffer );
-
-
-/*****************************************************************************************
- * checkDxExtensionVersion
- *
- *      Returns the EXTENSION_INTERFACE_VERSION supported by the driver
- *      EXTENSION_INTERFACE_VERSION_1_0 supports extensions for pixel synchronization and
- *      instant access of graphics memory
- *
- *****************************************************************************************/
-unsigned int checkDxExtensionVersion();
-
-
-/*****************************************************************************************
-* getCPUInfo
-*
-*      Parses CPUID output to find the brand and vendor strings.
-*
-*****************************************************************************************/
-void getCPUInfo(std::string* cpubrand, std::string* cpuvendor);
-
-
-/*****************************************************************************************
-* getGTGeneration
-*
-*      Returns the generation by parsing the device id. The first two digits of the hex
-*      number generally denote the generation. Sandybridge and Ivybridge share the same
-*      numbers so they must be further parsed.
-*
-*      Comparison of the deviceIds (for example to see if a device is more recent than
-*      another) does not always work.
-*
-*****************************************************************************************/
-PRODUCT_FAMILY getGTGeneration(unsigned int deviceId);
-
-
-
-
-#define GGF_SUCCESS 0
-#define GGF_ERROR					-1
-#define GGF_E_UNSUPPORTED_HARDWARE	-2
-#define GGF_E_UNSUPPORTED_DRIVER	-3
-#define GGF_E_D3D_ERROR				-4
\ No newline at end of file
diff --git a/gpudetect/GPUDetect.icproj b/gpudetect/GPUDetect.icproj
deleted file mode 100644
index 6ad1c95..0000000
--- a/gpudetect/GPUDetect.icproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Intel C++ Project"
-	Version="12.0"
-	Name="GPUDetect"
-	ProjectGUID="{FCC176EA-806F-41F4-A5FC-0D259476AF18}"
-	VCNestedProjectGUID="{83F2F347-9ECF-4A29-9F65-05794A299F00}"
-	VCNestedProjectFileName="GPUDetect.vcproj"
-	>
-	<Configurations/>
-	<Files/>
-</VisualStudioProject>
diff --git a/gpudetect/GPUDetect.vcproj b/gpudetect/GPUDetect.vcproj
deleted file mode 100644
index 261a6f4..0000000
--- a/gpudetect/GPUDetect.vcproj
+++ /dev/null
@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="GPUDetect"
-	ProjectGUID="{83F2F347-9ECF-4A29-9F65-05794A299F00}"
-	RootNamespace="GPUDetect"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="$(DXSDK_DIR)\Include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wbemuuid.lib d3d11.lib dxerr.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(DXSDK_DIR)\Lib\x86"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy IntelGfx.cfg &quot;$(OutDir)&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="$(DXSDK_DIR)\Include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wbemuuid.lib d3d11.lib dxerr.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(DXSDK_DIR)\Lib\x64"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy IntelGfx.cfg &quot;$(OutDir)&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="$(DXSDK_DIR)\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wbemuuid.lib D3D11.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(DXSDK_DIR)\Lib\x86"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy IntelGfx.cfg &quot;$(OutDir)&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="$(DXSDK_DIR)\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wbemuuid.lib d3d11.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(DXSDK_DIR)\Lib\x64"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy IntelGfx.cfg &quot;$(OutDir)&quot;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\DeviceId.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\DX9Extensions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\TestMain.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resources"
-			>
-			<File
-				RelativePath=".\IntelGfx.cfg"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Headers"
-			>
-			<File
-				RelativePath=".\DeviceId.h"
-				>
-			</File>
-			<File
-				RelativePath=".\DX9Extensions.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/gpudetect/GPUDetect_2015.sln b/gpudetect/GPUDetect_2015.sln
deleted file mode 100644
index 6853d36..0000000
--- a/gpudetect/GPUDetect_2015.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2015
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPUDetect", "GPUDetect_2015.vcxproj", "{83F2F347-9ECF-4A29-9F65-05794A299F00}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Debug|Win32.ActiveCfg = Debug|Win32
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Debug|Win32.Build.0 = Debug|Win32
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Debug|x64.ActiveCfg = Debug|x64
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Debug|x64.Build.0 = Debug|x64
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Release|Win32.ActiveCfg = Release|Win32
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Release|Win32.Build.0 = Release|Win32
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Release|x64.ActiveCfg = Release|x64
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/gpudetect/GPUDetect_2015.vcxproj b/gpudetect/GPUDetect_2015.vcxproj
deleted file mode 100644
index d94bbc6..0000000
--- a/gpudetect/GPUDetect_2015.vcxproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{83F2F347-9ECF-4A29-9F65-05794A299F00}</ProjectGuid>
-    <RootNamespace>GPUDetect</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>ole32.lib;oleaut32.lib;wbemuuid.lib;D3D11.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy IntelGfx.cfg "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ole32.lib;oleaut32.lib;wbemuuid.lib;D3D11.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy IntelGfx.cfg "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-      <AdditionalDependencies>ole32.lib;oleaut32.lib;wbemuuid.lib;D3D11.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy IntelGfx.cfg "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ole32.lib;oleaut32.lib;wbemuuid.lib;D3D11.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy IntelGfx.cfg "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="DeviceId.cpp" />
-    <ClCompile Include="TestMain.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="IntelGfx.cfg" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="DeviceId.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/gpudetect/GPUDetect_2017.sln b/gpudetect/GPUDetect_2017.sln
deleted file mode 100644
index 7604bb2..0000000
--- a/gpudetect/GPUDetect_2017.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2017
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPUDetect", "GPUDetect_2017.vcxproj", "{83F2F347-9ECF-4A29-9F65-05794A299F00}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Debug|Win32.ActiveCfg = Debug|Win32
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Debug|Win32.Build.0 = Debug|Win32
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Debug|x64.ActiveCfg = Debug|x64
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Debug|x64.Build.0 = Debug|x64
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Release|Win32.ActiveCfg = Release|Win32
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Release|Win32.Build.0 = Release|Win32
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Release|x64.ActiveCfg = Release|x64
-		{83F2F347-9ECF-4A29-9F65-05794A299F00}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/gpudetect/GPUDetect_2017.vcxproj b/gpudetect/GPUDetect_2017.vcxproj
deleted file mode 100644
index 6969afa..0000000
--- a/gpudetect/GPUDetect_2017.vcxproj
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{83F2F347-9ECF-4A29-9F65-05794A299F00}</ProjectGuid>
-    <RootNamespace>GPUDetect</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-    <ProjectName>GPUDetect</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-    <CLRSupport>false</CLRSupport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <CLRSupport>false</CLRSupport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-    <CLRSupport>false</CLRSupport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <CLRSupport>false</CLRSupport>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)x64\$(Configuration)\Bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)x64\$(Configuration)\Bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)x64\$(Configuration)\Bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)x64\$(Configuration)\Bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>$(ProjectName)$(PlatformArchitecture)</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>$(ProjectName)$(PlatformArchitecture)</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)$(PlatformArchitecture)</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>$(ProjectName)$(PlatformArchitecture)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAsManaged>
-      </CompileAsManaged>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>ole32.lib;oleaut32.lib;wbemuuid.lib;D3D11.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy IntelGfx.cfg "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAsManaged>
-      </CompileAsManaged>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ole32.lib;oleaut32.lib;wbemuuid.lib;D3D11.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy IntelGfx.cfg "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAsManaged>
-      </CompileAsManaged>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-      <AdditionalDependencies>ole32.lib;oleaut32.lib;wbemuuid.lib;D3D11.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy IntelGfx.cfg "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAsManaged>
-      </CompileAsManaged>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ole32.lib;oleaut32.lib;wbemuuid.lib;D3D11.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy IntelGfx.cfg "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="DeviceId.cpp" />
-    <ClCompile Include="TestMain.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="IntelGfx.cfg" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="DeviceId.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/gpudetect/ID3D10Extensions.h b/gpudetect/ID3D10Extensions.h
deleted file mode 100644
index a88510c..0000000
--- a/gpudetect/ID3D10Extensions.h
+++ /dev/null
@@ -1,310 +0,0 @@
-//--------------------------------------------------------------------------------------
-// Copyright 2011,2012,2013 Intel Corporation
-// All Rights Reserved
-//
-// Permission is granted to use, copy, distribute and prepare derivative works of this
-// software for any purpose and without fee, provided, that the above copyright notice
-// and this statement appear in all copies.  Intel makes no representations about the
-// suitability of this software for any purpose.  THIS SOFTWARE IS PROVIDED "AS IS."
-// INTEL SPECIFICALLY DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, AND ALL LIABILITY,
-// INCLUDING CONSEQUENTIAL AND OTHER INDIRECT DAMAGES, FOR THE USE OF THIS SOFTWARE,
-// INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PROPRIETARY RIGHTS, AND INCLUDING THE
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  Intel does not
-// assume any responsibility for any errors which may appear in this software nor any
-// responsibility to update it.
-//--------------------------------------------------------------------------------------
-#pragma once
-
-namespace ID3D10
-{
-
-/*****************************************************************************\
-CONST: EXTENSION_INTERFACE_VERSION
-PURPOSE: Version of this header file
-\*****************************************************************************/
-const UINT EXTENSION_INTERFACE_VERSION_1_0  = 0x00010000;
-const UINT EXTENSION_INTERFACE_VERSION      = EXTENSION_INTERFACE_VERSION_1_0;
-
-/*****************************************************************************\
-CONST: CAPS_EXTENSION_KEY
-PURPOSE: KEY to pass to UMD
-\*****************************************************************************/
-const char CAPS_EXTENSION_KEY[16] = {
-    'I','N','T','C',
-    'E','X','T','N',
-    'C','A','P','S',
-    'F','U','N','C' };
-
-/*****************************************************************************\
-TYPEDEF: PFND3D10UMDEXT_CHECKEXTENSIONSUPPORT
-PURPOSE: Function pointer for shader flag extensions
-\*****************************************************************************/
-typedef BOOL ( APIENTRY* PFND3D10UMDEXT_CHECKEXTENSIONSUPPORT )( UINT );
-
-/*****************************************************************************\
-STRUCT: EXTENSION_BASE
-PURPOSE: Base data structure for extension initialization data
-\*****************************************************************************/
-struct EXTENSION_BASE
-{
-    // Input:
-    char    Key[16];                // CAPS_EXTENSION_KEY
-    UINT    ApplicationVersion;     // EXTENSION_INTERFACE_VERSION
-};
-
-/*****************************************************************************\
-STRUCT: CAPS_EXTENSION_1_0
-PURPOSE: Caps data structure
-\*****************************************************************************/
-struct CAPS_EXTENSION_1_0 : EXTENSION_BASE
-{
-    // Output:
-    UINT    DriverVersion;          // EXTENSION_INTERFACE_VERSION
-    UINT    DriverBuildNumber;      // BUILD_NUMBER
-};
-
-typedef CAPS_EXTENSION_1_0  CAPS_EXTENSION;
-
-#ifndef D3D10_UMD
-/*****************************************************************************\
-FUNCTION: GetExtensionCaps
-PURPOSE: Gets extension caps table from Intel graphics driver
-\*****************************************************************************/
-inline HRESULT GetExtensionCaps(
-    ID3D11Device* pd3dDevice,
-    CAPS_EXTENSION* pCaps )
-{
-    D3D11_BUFFER_DESC desc;
-    ZeroMemory( &desc, sizeof(desc) );
-    desc.ByteWidth = sizeof(CAPS_EXTENSION);
-    desc.Usage = D3D11_USAGE_STAGING;
-    desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
-
-    D3D11_SUBRESOURCE_DATA initData;
-    initData.pSysMem = pCaps;
-    initData.SysMemPitch = sizeof(CAPS_EXTENSION);
-    initData.SysMemSlicePitch = 0;
-
-    ZeroMemory( pCaps, sizeof(CAPS_EXTENSION) );
-    memcpy( pCaps->Key, CAPS_EXTENSION_KEY,
-        sizeof(pCaps->Key) );
-    pCaps->ApplicationVersion = EXTENSION_INTERFACE_VERSION;
-
-    ID3D11Buffer* pBuffer = NULL;
-    HRESULT result = pd3dDevice->CreateBuffer( 
-        &desc,
-        &initData,
-        &pBuffer );
-
-    if( pBuffer )
-        pBuffer->Release();
-
-    if( S_OK == result )
-    {
-        result = ( pCaps->ApplicationVersion <= pCaps->DriverVersion ) ? S_OK : S_FALSE;
-    }
-    return result;
-};
-#endif
-
-/*****************************************************************************\
-CONST: RESOURCE_EXTENSION_KEY
-PURPOSE: KEY to pass to UMD
-\*****************************************************************************/
-const char RESOURCE_EXTENSION_KEY[16] = {
-    'I','N','T','C',
-    'E','X','T','N',
-    'R','E','S','O',
-    'U','R','C','E' };
-
-/*****************************************************************************\
-ENUM: RESOURCE_EXTENSION_TYPE
-PURPOSE: Enumeration of supported resource extensions
-\*****************************************************************************/
-enum RESOURCE_EXTENSION_TYPE
-{
-    RESOURCE_EXTENSION_RESERVED = 0,
-
-    // Version 1_0
-    RESOURCE_EXTENSION_DIRECT_ACCESS = 1,
-};
-
-/*****************************************************************************\
-ENUM: RESOURCE_EXTENSION_FLAGS
-PURPOSE: Enumeration for extra information
-\*****************************************************************************/
-enum RESOURCE_EXTENSION_FLAGS
-{
-    RESOURCE_EXTENSION_DIRECT_ACCESS_LINEAR_ALLOCATION = 0x1,
-};
-
-/*****************************************************************************\
-STRUCT: RESOURCE_EXTENSION_1_0
-PURPOSE: Resource extension interface structure
-\*****************************************************************************/
-struct RESOURCE_EXTENSION_1_0 : EXTENSION_BASE
-{
-    // Input:
-
-    // Enumeration of the extension
-    UINT    Type;       // RESOURCE_EXTENSION_TYPE
-
-    // Extension data
-    UINT    Data[16];
-};
-
-typedef RESOURCE_EXTENSION_1_0  RESOURCE_EXTENSION;
-
-/*****************************************************************************\
-STRUCT: RESOURCE_DIRECT_ACCESS_MAP_DATA
-PURPOSE: Direct Access Resource extension Map structure
-\*****************************************************************************/
-struct RESOURCE_DIRECT_ACCESS_MAP_DATA
-{
-    void*   pBaseAddress;
-    UINT    XOffset;
-    UINT    YOffset;
-
-    UINT    TileFormat;
-    UINT    Pitch;
-    UINT    Size;
-};
-
-#ifndef D3D10_UMD
-/*****************************************************************************\
-FUNCTION: SetResouceExtension
-PURPOSE: Resource extension interface
-\*****************************************************************************/
-inline HRESULT SetResouceExtension(
-    ID3D11Device* pd3dDevice,
-    const RESOURCE_EXTENSION* pExtnDesc )
-{
-    D3D11_BUFFER_DESC desc;
-    ZeroMemory( &desc, sizeof(desc) );
-    desc.ByteWidth = sizeof(RESOURCE_EXTENSION);
-    desc.Usage = D3D11_USAGE_STAGING;
-    desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
-
-    D3D11_SUBRESOURCE_DATA initData;
-    ZeroMemory( &initData, sizeof(initData) );
-    initData.pSysMem = pExtnDesc;
-    initData.SysMemPitch = sizeof(RESOURCE_EXTENSION);
-    initData.SysMemSlicePitch = 0;
-
-    ID3D11Buffer* pBuffer = NULL;
-    HRESULT result = pd3dDevice->CreateBuffer( 
-        &desc,
-        &initData,
-        &pBuffer );
-
-    if( pBuffer )
-        pBuffer->Release();
-
-    return result;
-}
-
-/*****************************************************************************\
-FUNCTION: SetDirectAccessResouceExtension
-PURPOSE: Direct Access Resource extension interface
-\*****************************************************************************/
-inline HRESULT SetDirectAccessResouceExtension(
-    ID3D11Device* pd3dDevice,
-    const UINT flags )
-{
-    RESOURCE_EXTENSION extnDesc;
-    ZeroMemory( &extnDesc, sizeof(extnDesc) );
-    memcpy( &extnDesc.Key[0], RESOURCE_EXTENSION_KEY,
-        sizeof(extnDesc.Key) );
-    extnDesc.ApplicationVersion = EXTENSION_INTERFACE_VERSION;
-    extnDesc.Type = RESOURCE_EXTENSION_DIRECT_ACCESS;
-    extnDesc.Data[0] = flags;
-
-    return SetResouceExtension( pd3dDevice, &extnDesc );
-}
-#endif
-
-/*****************************************************************************\
-CONST: STATE_EXTENSION_KEY
-PURPOSE: KEY to pass to UMD
-\*****************************************************************************/
-const char STATE_EXTENSION_KEY[16] = {
-    'I','N','T','C',
-    'E','X','T','N',
-    'S','T','A','T',
-    'E','O','B','J' };
-
-/*****************************************************************************\
-ENUM: STATE_EXTENSION_TYPE
-PURPOSE: Enumeration of supported state extensions
-\*****************************************************************************/
-enum STATE_EXTENSION_TYPE
-{
-    STATE_EXTENSION_RESERVED = 0,
-
-    // Version 1_0
-};
-
-/*****************************************************************************\
-STRUCT: STATE_EXTENSION_1_0
-PURPOSE: UMD extension interface structure
-\*****************************************************************************/
-struct STATE_EXTENSION_1_0 : EXTENSION_BASE
-{
-    // Input:
-
-    // Enumeration of the extension
-    UINT    Type;       // STATE_EXTENSION_TYPE
-
-    // Extension data
-    UINT    Data[16];
-};
-
-typedef STATE_EXTENSION_1_0 STATE_EXTENSION;
-
-#ifndef D3D10_UMD
-/*****************************************************************************\
-FUNCTION: SetStateExtension
-PURPOSE: State extension interface
-\*****************************************************************************/
-inline HRESULT SetStateExtension(
-    ID3D11Device* pd3dDevice,
-    const STATE_EXTENSION* pExtnDesc )
-{
-    D3D11_BUFFER_DESC desc;
-    ZeroMemory( &desc, sizeof(desc) );
-    desc.ByteWidth = sizeof(STATE_EXTENSION);
-    desc.Usage = D3D11_USAGE_STAGING;
-    desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
-
-    D3D11_SUBRESOURCE_DATA initData;
-    ZeroMemory( &initData, sizeof(initData) );
-    initData.pSysMem = pExtnDesc;
-    initData.SysMemPitch = sizeof(STATE_EXTENSION);
-    initData.SysMemSlicePitch = 0;
-
-    ID3D11Buffer* pBuffer = NULL;
-    HRESULT result = pd3dDevice->CreateBuffer( 
-        &desc,
-        &initData,
-        &pBuffer );
-
-    if( pBuffer )
-        pBuffer->Release();
-
-    return result;
-}
-#endif
-
-/*****************************************************************************\
-ENUM: SHADER_EXTENSION_TYPE
-PURPOSE: Enumeration of supported shader extensions
-\*****************************************************************************/
-enum SHADER_EXTENSION_TYPE
-{
-    SHADER_EXTENSION_RESERVED = 0,
-
-    // Version 1_0
-	SHADER_EXTENSION_PIXEL_SHADER_ORDERING = 1,    
-};
-
-} // namespace ID3D10
diff --git a/gpudetect/TestMain.cpp b/gpudetect/TestMain.cpp
deleted file mode 100644
index b992640..0000000
--- a/gpudetect/TestMain.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////////////////
-// Copyright 2017 Intel Corporation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-#include <conio.h>
-#include <stdio.h>
-#include "DeviceId.h"
-#include <string>
-
-#include "D3D11.h"
-#include "ID3D10Extensions.h"
-#include <intrin.h>
-
-
-// Define settings to reflect Fidelity abstraction levels you need
-typedef enum
-{
-	NotCompatible,  // Found GPU is not compatible with the app
-	Low,
-	Medium,
-	MediumPlus,
-	High,
-	Undefined  // No predefined setting found in cfg file. 
-			   // Use a default level for unknown video cards.
-}
-PresetLevel;
-
-const char *PRODUCT_FAMILY_STRING[] =
-{
-	"Sandy Bridge",
-	"Ivy Bridge",
-	"Haswell",
-	"ValleyView",
-	"Broadwell",
-	"Cherryview",
-	"Skylake",
-	"Kabylake",
-	"Coffeelake"
-};
-const unsigned int NUM_PRODUCT_FAMILIES = sizeof(PRODUCT_FAMILY_STRING) / sizeof(PRODUCT_FAMILY_STRING[0]);
-
-PresetLevel getDefaultFidelityPresets(unsigned int VendorId, unsigned int DeviceId);
-
-/*****************************************************************************************
-* main
-*
-*     Function represents the game or application. The application checks for graphics
-*     capabilities here and makes whatever decisions it needs to based on the results.
-*
-*****************************************************************************************/
-int main( int argc, char* argv[] )
-{
-	//
-	// First we need to check if it is an Intel processor. If not then an alternate
-	// path should be taken. This is also a good place to check for other CPU capabilites
-	// such as AVX support.
-	//
-	std::string CPUBrand;
-	std::string CPUVendor;
-
-	getCPUInfo(&CPUBrand, &CPUVendor);
-	if (CPUVendor != "GenuineIntel") {
-		printf("Not an Intel CPU");
-		_getch();
-		return 0;
-	}
-
-	//
-	// The brand string can be parsed to discover some information about the type of
-	// processor.
-	//
-	printf( "CPU Brand: %s\n", CPUBrand.c_str() );
-
-	std::size_t found = CPUBrand.find("i7");
-	if (found != std::string::npos)
-	{
-		printf( "i7 Brand Found\n" );
-	}
-
-	found = CPUBrand.find("i5");
-	if (found != std::string::npos)
-	{
-		printf( "i5 Brand Found\n" );
-	}
-
-	found = CPUBrand.find("i3");
-	if (found != std::string::npos)
-	{
-		printf( "i3 Brand Found\n" );
-	}
-
-	found = CPUBrand.find("Celeron");
-	if (found != std::string::npos)
-	{
-		printf( "Celeron Brand Found\n" );
-	}
-
-	found = CPUBrand.find("Pentium");
-	if (found != std::string::npos)
-	{
-		printf( "Pentium Brand Found\n" );
-	}
-
-	//
-	// Some information about the gfx adapters is exposed through Windows and DXGI. If
-	// the machine has multiple gfx adapters or no Intel gfx this is where that can be
-	// detected.
-	//
-	unsigned int VendorId, DeviceId;
-	unsigned __int64 VideoMemory;
-	std::wstring GFXBrand;
-
-	if (false == getGraphicsDeviceInfo(&VendorId, &DeviceId, &VideoMemory, &GFXBrand))
-	{
-		printf("Intel Graphics Adapter not detected\n");
-		return -1;
-	}
-
-	printf("Primary Graphics Device\n");
-	printf("-----------------------\n");
-	printf("Vendor( 0x%x ) : Device ( 0x%x )\n", VendorId, DeviceId);
-	printf("Video Memory: %I64u MB\n", VideoMemory / (1024 * 1024));
-	printf("Graphics Brand: %S\n", GFXBrand.c_str());
-
-	//
-	// Similar to the CPU brand, we can also parse the GPU brand string for information like whether
-	// is an Iris or Iris Pro part.
-	//
-	std::string TempGPUBrand;
-	char* ConvertArray = new char[(int)GFXBrand.size()];
-	WideCharToMultiByte(CP_UTF8, 0, &GFXBrand[0], (int)GFXBrand.size(), &ConvertArray[0], (int)GFXBrand.size(), NULL, NULL);
-	TempGPUBrand = ConvertArray;
-	found = TempGPUBrand.find("Iris");
-	if (found != std::string::npos)
-	{
-		found = TempGPUBrand.find("Pro");
-		if (found != std::string::npos)
-		{
-			printf("Iris Pro Graphics Brand Found\n");
-		}
-		else
-		{
-			printf("Iris Graphics Brand Found\n");
-		}
-	}
-	delete[] ConvertArray;
-
-	//
-	// The deviceID can be used as an index into the configuration file to load other information.
-	//
-	PresetLevel defPresets;
-	defPresets = getDefaultFidelityPresets(VendorId, DeviceId);
-
-	if (defPresets == NotCompatible) {
-		printf("Default Presets = NotCompatible\n");
-	}
-	else if (defPresets == Low) {
-		printf("Default Presets = Low\n");
-	}
-	else if (defPresets == Medium) {
-		printf("Default Presets = Medium\n");
-	}
-	else if (defPresets == MediumPlus) {
-		printf("Default Presets = Medium+\n");
-	}
-    printf("\n");
-
-	//
-    // Check for DX extensions
-	//
-    unsigned int extensionVersion = checkDxExtensionVersion();
-	if (extensionVersion >= ID3D10::EXTENSION_INTERFACE_VERSION_1_0) {
-		printf("Supports Intel Iris Graphics extensions: \n\tpixel sychronization \n\tinstant access of graphics memory\n\n");
-	}
-	else {
-		printf("Does not support Intel Iris Graphics extensions\n\n");
-	}
-
-	//
-	// In DirectX, Intel exposes additional information through the driver that can be obtained
-	// querying a special DX counter
-	//
-	IntelDeviceInfoHeader intelDeviceInfoHeader = { 0 };
-	unsigned char intelDeviceInfoBuffer[1024];
-
-	long getStatus = getIntelDeviceInfo( VendorId, &intelDeviceInfoHeader, &intelDeviceInfoBuffer );
-
-	if ( getStatus == GGF_SUCCESS )
-	{
-		printf("Intel Device Info Version  %d (%d bytes)\n", intelDeviceInfoHeader.Version, intelDeviceInfoHeader.Size );
-
-		if ( intelDeviceInfoHeader.Version == 2 )
-		{
-			IntelDeviceInfoV2 intelDeviceInfo;
-
-			memcpy( &intelDeviceInfo, intelDeviceInfoBuffer, intelDeviceInfoHeader.Size );
-
-			int myGeneration = intelDeviceInfo.GTGeneration;
-			int generationIndex = myGeneration - IGFX_SANDYBRIDGE;
-			const char *myGenerationString;
-
-			if (myGeneration < IGFX_SANDYBRIDGE) {
-				myGenerationString = "Old unrecognized generation";
-			}
-			else if (myGeneration > (NUM_PRODUCT_FAMILIES + IGFX_SANDYBRIDGE)) {
-				myGenerationString = "New unrecognized generation";
-			}
-			else {
-				myGenerationString = PRODUCT_FAMILY_STRING[generationIndex];
-			}
-
-			printf("GT Generation:             %s (0x%x)\n", myGenerationString, intelDeviceInfo.GTGeneration );
-			printf("GPU Max Frequency:         %d mhz\n", intelDeviceInfo.GPUMaxFreq );
-			printf("GPU Min Frequency:         %d mhz\n", intelDeviceInfo.GPUMinFreq );
-			printf("EU Count:                  %d\n", intelDeviceInfo.EUCount );
-			printf("Package TDP:               %d watts\n", intelDeviceInfo.PackageTDP );
-			printf("Max Fill Rate:             %d pixel/clk\n", intelDeviceInfo.MaxFillRate );
-		}
-		else if (intelDeviceInfoHeader.Version == 1)
-		{
-			IntelDeviceInfoV1 intelDeviceInfo;
-
-			memcpy( &intelDeviceInfo, intelDeviceInfoBuffer, intelDeviceInfoHeader.Size );
-
-			printf("GPU Max Frequency:         %d mhz\n", intelDeviceInfo.GPUMaxFreq );
-			printf("GPU Min Frequency:         %d mhz\n", intelDeviceInfo.GPUMinFreq );
-		}
-		else
-		{
-			printf("Unrecognized Intel Device Header version\n");
-		}
-	}
-	else if ( getStatus == GGF_E_UNSUPPORTED_HARDWARE )
-	{
-		printf("GPU min/max turbo frequency: unknown\n");
-		printf("GPU does not support frequency query\n");
-	}
-	else if( getStatus == GGF_E_UNSUPPORTED_DRIVER )
-	{
-		printf("Intel device information: unknown\n");
-		printf("Driver does not support device information query\n");
-	}
-	else
-	{
-		printf("Intel device information: unknown\n");
-		printf("Error retrieving frequency information\n");
-    }
-
-    printf("\n");
-    printf("Press any key to exit...\n");
-
-	_getch();
-    return 0;
-}
-
-/*****************************************************************************************
-* getDefaultFidelityPresets
-*
-*     Function to find the default fidelity preset level, based on the type of
-*     graphics adapter present.
-*
-*     The guidelines for graphics preset levels for Intel devices is a generic one
-*     based on our observations with various contemporary games. You would have to
-*     change it if your game already plays well on the older hardware even at high
-*     settings.
-*
-*****************************************************************************************/
-
-PresetLevel getDefaultFidelityPresets(unsigned int VendorId, unsigned int DeviceId)
-{
-	//
-	// Look for a config file that qualifies devices from any vendor
-	// The code here looks for a file with one line per recognized graphics
-	// device in the following format:
-	//
-	// VendorIDHex, DeviceIDHex, CapabilityEnum      ;Commented name of card
-	//
-
-	FILE *fp = NULL;
-	const char *cfgFileName;
-	cfgFileName = "";
-
-	switch (VendorId)
-	{
-	case 0x8086:
-		cfgFileName = "IntelGfx.cfg";
-		break;
-		//case 0x1002:
-		//    cfgFileName =  "ATI.cfg"; // not provided
-		//    break;
-
-		//case 0x10DE:
-		//    cfgFileName = "Nvidia.cfg"; // not provided
-		//    break;
-
-	default:
-		break;
-	}
-
-	fopen_s(&fp, cfgFileName, "r");
-
-	PresetLevel presets = Undefined;
-
-	if (fp)
-	{
-		char line[100];
-		char* context = NULL;
-
-		char* szVendorId = NULL;
-		char* szDeviceId = NULL;
-		char* szPresetLevel = NULL;
-
-		//
-		// read one line at a time till EOF
-		//
-		while (fgets(line, 100, fp))
-		{
-			//
-			// Parse and remove the comment part of any line
-			//
-			int i; for (i = 0; line[i] && line[i] != ';'; i++); line[i] = '\0';
-
-			//
-			// Try to extract VendorId, DeviceId and recommended Default Preset Level
-			//
-			szVendorId = strtok_s(line, ",\n", &context);
-			szDeviceId = strtok_s(NULL, ",\n", &context);
-			szPresetLevel = strtok_s(NULL, ",\n", &context);
-
-			if ((szVendorId == NULL) ||
-				(szDeviceId == NULL) ||
-				(szPresetLevel == NULL))
-			{
-				continue;  // blank or improper line in cfg file - skip to next line
-			}
-
-			unsigned int vId, dId;
-			sscanf_s(szVendorId, "%x", &vId);
-			sscanf_s(szDeviceId, "%x", &dId);
-
-			//
-			// If current graphics device is found in the cfg file, use the 
-			// pre-configured default Graphics Presets setting.
-			//
-			if ((vId == VendorId) && (dId == DeviceId))
-			{
-				char s[10];
-				sscanf_s(szPresetLevel, "%s", s, _countof(s));
-
-				if (!_stricmp(s, "Low"))
-					presets = Low;
-				else if (!_stricmp(s, "Medium"))
-					presets = Medium;
-				else if (!_stricmp(s, "Medium+"))
-					presets = MediumPlus;
-				else if (!_stricmp(s, "High"))
-					presets = High;
-				else
-					presets = NotCompatible;
-
-				break;
-			}
-		}
-
-		fclose(fp);  // Close open file handle
-	}
-	else
-	{
-		printf("%s not found! Presets undefined.\n", cfgFileName);
-	}
-
-	//
-	// If the current graphics device was not listed in any of the config
-	// files, or if config file not found, use Low settings as default.
-	// This should be changed to reflect the desired behavior for unknown
-	// graphics devices.
-	//
-	if (presets == Undefined) {
-		presets = Low;
-	}
-
-	return presets;
-}