diff --git a/Makefile.am b/Makefile.am
index 067c4b75..bcfd0157 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,7 +141,7 @@ skein.o: skein.cu
 	$(NVCC) $(nvcc_FLAGS) --maxrregcount=64 -o $@ -c $<
 
 neoscrypt/cuda_neoscrypt.o: neoscrypt/cuda_neoscrypt.cu
-	$(NVCC) -gencode=arch=compute_61,code=sm_61 -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_52,code=sm_52 -gencode=arch=compute_50,code=sm_50 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_37,code=sm_37 -gencode=arch=compute_70,code=sm_70 -gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_80,code=sm_80 @CUDA_INCLUDES@ -I. @CUDA_CFLAGS@ -o $@ -c $<
+	$(NVCC) -gencode=arch=compute_61,code=sm_61 -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_52,code=sm_52 -gencode=arch=compute_50,code=sm_50 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_37,code=sm_37 -gencode=arch=compute_70,code=sm_70 -gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_86,code=sm_86 @CUDA_INCLUDES@ -I. @CUDA_CFLAGS@ -o $@ -c $<
 
 neoscrypt/cuda_neoscrypt_tpruvot.o: neoscrypt/cuda_neoscrypt_tpruvot.cu
-	$(NVCC) -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_61,code=sm_61 -gencode=arch=compute_70,code=sm_70 -gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_80,code=sm_80 @CUDA_INCLUDES@ -I. $(JANSSON_INCLUDES) @CUDA_CFLAGS@ -o $@ -c $<
+	$(NVCC) -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_61,code=sm_61 -gencode=arch=compute_70,code=sm_70 -gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_86,code=sm_86 @CUDA_INCLUDES@ -I. $(JANSSON_INCLUDES) @CUDA_CFLAGS@ -o $@ -c $<
diff --git a/ccminer.cpp b/ccminer.cpp
index a7ef4521..d64bf77f 100644
--- a/ccminer.cpp
+++ b/ccminer.cpp
@@ -2945,8 +2945,8 @@ int main(int argc, char *argv[])
 	printf("using the Nvidia CUDA Toolkit %d.%d\n\n", CUDART_VERSION / 1000, (CUDART_VERSION % 1000) / 10);
 
 #ifdef WIN32
-	if (CUDART_VERSION == 10010 && _MSC_VER > 1920)
-		printf("WARNING! CUDA 10.1 might not be compatible with Visual Studio versions newer than 2019 RTW\n\n");
+	if (CUDART_VERSION >= 10010 && _MSC_VER > 1929)
+		printf("WARNING! CUDA %d.%d might not be compatible with Visual Studio versions newer than 2019\n\n", CUDART_VERSION / 1000, (CUDART_VERSION % 1000) / 10);
 	if(CUDART_VERSION == 10000 && _MSC_VER >= 1920)
 		printf("WARNING! CUDA 10 is not compatible with Visual Studio versions newer than 2017\n\n");
 	if (CUDART_VERSION == 9020 && _MSC_VER > 1913)
@@ -2955,13 +2955,19 @@ int main(int argc, char *argv[])
 #if !defined __clang__ && defined __GNUC__
 #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 	if(CUDART_VERSION == 8000 && GCC_VERSION > 50000)
-		printf("WARNING! CUDA 8 IS NOT COMPATIBLE WITH GCC VERSION NEWER THAN 5!\n");
+		printf("WARNING! CUDA 8 IS NOT COMPATIBLE WITH GCC VERSIONS NEWER THAN 5!\n");
 	if((CUDART_VERSION == 9000 || CUDART_VERSION == 9010) && GCC_VERSION > 60000)
-		printf("WARNING! CUDA 9 AND 9.1 ARE NOT COMPATIBLE WITH GCC VERSION NEWER THAN 6!\n");
+		printf("WARNING! CUDA 9 AND 9.1 ARE NOT COMPATIBLE WITH GCC VERSIONS NEWER THAN 6!\n");
 	if ((CUDART_VERSION == 10000 || CUDART_VERSION == 9020) && GCC_VERSION > 70301)
-		printf("WARNING! CUDA 9.2 AND CUDA 10 ARE NOT COMPATIBLE WITH GCC VERSION NEWER THAN 7.3.1!\n");
+		printf("WARNING! CUDA 9.2 AND CUDA 10 ARE NOT COMPATIBLE WITH GCC VERSIONS NEWER THAN 7.3.1!\n");
 	if (CUDART_VERSION == 10010 && GCC_VERSION > 80201)
-		printf("WARNING! CUDA 10.1 IS NOT COMPATIBLE WITH GCC VERSION NEWER THAN 8.2.1!\n");
+		printf("WARNING! CUDA 10.1 IS NOT COMPATIBLE WITH GCC VERSIONS NEWER THAN 8.2.1!\n");
+	if (CUDART_VERSION == 10020 && GCC_VERSION > 80201)
+		printf("WARNING! CUDA 10.2 IS NOT COMPATIBLE WITH GCC VERSIONS NEWER THAN 8.2.1!\n");
+	if (CUDART_VERSION == 11000 && GCC_VERSION > 90300)
+		printf("WARNING! CUDA 11.0 IS NOT COMPATIBLE WITH GCC VERSIONS NEWER THAN 9.3.0!\n");
+	if (CUDART_VERSION == 11010 && GCC_VERSION > 100001)
+		printf("WARNING! CUDA 11.1 IS NOT COMPATIBLE WITH GCC VERSIONS NEWER THAN 10.0.1!\n");
 #endif
 
 	long      sat[1];
diff --git a/ccminer.vcxproj b/ccminer.vcxproj
index ec7f6ba7..a516fc73 100644
--- a/ccminer.vcxproj
+++ b/ccminer.vcxproj
@@ -55,7 +55,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.0.props" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.1.props" />
   </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" />
@@ -247,7 +247,7 @@
       <MaxRegCount>80</MaxRegCount>
       <PtxAsOptionV>false</PtxAsOptionV>
       <Keep>true</Keep>
-      <CodeGeneration>compute_60,sm_60;compute_61,sm_61;compute_52,sm_52;compute_50,sm_50;compute_35,sm_35;compute_37,sm_37;compute_70,sm_70;compute_75,sm_75;compute_80,sm_80</CodeGeneration>
+      <CodeGeneration>compute_60,sm_60;compute_61,sm_61;compute_52,sm_52;compute_50,sm_50;compute_35,sm_35;compute_37,sm_37;compute_70,sm_70;compute_75,sm_75;compute_86,sm_86</CodeGeneration>
       <Include>
       </Include>
       <TargetMachinePlatform>64</TargetMachinePlatform>
@@ -286,7 +286,7 @@
     <CudaCompile Include="lyra2\lyra2REv3.cpp" />
     <CudaCompile Include="neoscrypt\cuda_neoscrypt_tpruvot.cu">
       <CodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">compute_52,sm_52;compute_50,sm_50;compute_35,sm_35;compute_37,sm_37</CodeGeneration>
-      <CodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|x64'">compute_80,sm_80;compute_75,sm_75;compute_70,sm_70;compute_61,sm_61;compute_52,sm_52;compute_50,sm_50;compute_35,sm_35;compute_37,sm_37</CodeGeneration>
+      <CodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|x64'">compute_86,sm_86;compute_75,sm_75;compute_70,sm_70;compute_61,sm_61;compute_52,sm_52;compute_50,sm_50;compute_35,sm_35;compute_37,sm_37</CodeGeneration>
     </CudaCompile>
     <CudaCompile Include="Sia\sia.cpp" />
     <ClCompile Include="nvapi.cpp" />
@@ -434,7 +434,7 @@
     <CudaCompile Include="Algo256\cuda_skein256.cu" />
     <CudaCompile Include="neoscrypt\cuda_neoscrypt.cu">
       <CodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">compute_52,sm_52;compute_50,sm_50;compute_35,sm_35;compute_37,sm_37;</CodeGeneration>
-      <CodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|x64'">compute_52,sm_52;compute_50,sm_50;compute_35,sm_35;compute_37,sm_37;compute_70,sm_70;compute_75,sm_75;compute_80,sm_80</CodeGeneration>
+      <CodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|x64'">compute_52,sm_52;compute_50,sm_50;compute_35,sm_35;compute_37,sm_37;compute_70,sm_70;compute_75,sm_75;compute_86,sm_86</CodeGeneration>
     </CudaCompile>
     <CudaCompile Include="neoscrypt\neoscrypt.cpp">
       <CodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">compute_52,sm_52;compute_50,sm_50;compute_35,sm_35;compute_37,sm_37;</CodeGeneration>
@@ -532,7 +532,7 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.0.targets" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.1.targets" />
   </ImportGroup>
   <!-- Copy the required dlls -->
   <Target Name="AfterBuild">
diff --git a/neoscrypt/neoscrypt.cpp b/neoscrypt/neoscrypt.cpp
index 8235a175..704e1df3 100644
--- a/neoscrypt/neoscrypt.cpp
+++ b/neoscrypt/neoscrypt.cpp
@@ -56,15 +56,25 @@ int scanhash_neoscrypt(bool stratum, int thr_id, uint32_t *pdata,
 			intensity = 256 * 64 * 5;
 			use_tpruvot = true;
 		}
+		else if (strstr(props.name, "3090"))
+		{
+			intensity = 256 * 64 * 32;
+			use_tpruvot = true; // benchmark needed
+		}
+		else if (strstr(props.name, "3080"))
+		{
+			intensity = 256 * 64 * 32;
+			use_tpruvot = true; // benchmark needed
+		}
 		else if(strstr(props.name, "2080"))
 		{
 			intensity = 256 * 64 * 32;
-			use_tpruvot = true;
+			use_tpruvot = true; // benchmark needed
 		}
 		else if(strstr(props.name, "2070"))
 		{
 			intensity = 256 * 64 * 16;
-			use_tpruvot = true;  // benchmark needed
+			use_tpruvot = true;  
 		}
 		else if(strstr(props.name, "RTX"))
 		{