diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6b43ff3..20c0d271 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ### Changelog
 
+#### Version - 2.5.3.22 - 6/13/2022
+* Stop WJ from attempting to proxy all manual files
+* Stop downloading the app twice when upgrading via the launcher
+* Fall back to Github when we get an error from the Nexus in the launcher
+
 #### Version - 2.5.3.21 - 6/9/2022
 * Fix a bug in the streaming MediaFire downloader
 * Improve the reliability of MediaFire, and Manual downloaders
diff --git a/Wabbajack.CLI/Wabbajack.CLI.csproj b/Wabbajack.CLI/Wabbajack.CLI.csproj
index 18beec34..ebf36e61 100644
--- a/Wabbajack.CLI/Wabbajack.CLI.csproj
+++ b/Wabbajack.CLI/Wabbajack.CLI.csproj
@@ -6,8 +6,8 @@
         <AssemblyName>wabbajack-cli</AssemblyName>
         <Company>Wabbajack</Company>
         <Platforms>x64</Platforms>
-        <AssemblyVersion>2.5.3.21</AssemblyVersion>
-        <FileVersion>2.5.3.21</FileVersion>
+        <AssemblyVersion>2.5.3.22</AssemblyVersion>
+        <FileVersion>2.5.3.22</FileVersion>
         <Copyright>Copyright © 2019-2022</Copyright>
         <Description>An automated ModList installer</Description>
         <PublishReadyToRun>true</PublishReadyToRun>        
diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj
index aacadd35..a73f13fe 100644
--- a/Wabbajack.Launcher/Wabbajack.Launcher.csproj
+++ b/Wabbajack.Launcher/Wabbajack.Launcher.csproj
@@ -4,8 +4,8 @@
         <OutputType>Exe</OutputType>
         <TargetFramework>net5.0-windows</TargetFramework>
         <UseWPF>true</UseWPF>
-        <AssemblyVersion>2.5.3.21</AssemblyVersion>
-        <FileVersion>2.5.3.21</FileVersion>
+        <AssemblyVersion>2.5.3.22</AssemblyVersion>
+        <FileVersion>2.5.3.22</FileVersion>
         <Copyright>Copyright © 2019-2022</Copyright>
         <Description>Wabbajack Application Launcher</Description>
         <PublishReadyToRun>true</PublishReadyToRun>
diff --git a/Wabbajack.Lib/AInstaller.cs b/Wabbajack.Lib/AInstaller.cs
index 3530e2ea..94e807e8 100644
--- a/Wabbajack.Lib/AInstaller.cs
+++ b/Wabbajack.Lib/AInstaller.cs
@@ -236,17 +236,8 @@ namespace Wabbajack.Lib
             var upgrades =  (await client.GetJsonAsync<ValidatedArchive[]>(Consts.UpgradedFilesURL));
 
             var tmp = new List<Archive>();
-            foreach (var miss in missing)
-            {
-                if (miss.State is ManualDownloader.State ms && await DownloadDispatcher.ProxyHas(new Uri(ms.Url)))
-                {
-                    tmp.Add(DownloadDispatcher.MaybeProxy(miss));
-                }
-                else
-                {
-                    tmp.Add(DownloadDispatcher.MaybeProxy(miss));
-                }
-            }
+            foreach (var miss in missing) 
+                tmp.Add(await DownloadDispatcher.MaybeProxy(miss));
             missing = tmp;
             
             if (download)
diff --git a/Wabbajack.Lib/Downloaders/DownloadDispatcher.cs b/Wabbajack.Lib/Downloaders/DownloadDispatcher.cs
index 9e2875e9..a35c15f6 100644
--- a/Wabbajack.Lib/Downloaders/DownloadDispatcher.cs
+++ b/Wabbajack.Lib/Downloaders/DownloadDispatcher.cs
@@ -107,7 +107,7 @@ namespace Wabbajack.Lib.Downloaders
 
         public static async Task<DownloadResult> DownloadWithPossibleUpgrade(Archive archive, AbsolutePath destination, ValidatedArchive[]? upgrades = null)
         {
-            archive = MaybeProxy(archive);
+            archive = await MaybeProxy(archive);
             
             bool ShouldTry(Archive archive)
             {
@@ -182,7 +182,7 @@ namespace Wabbajack.Lib.Downloaders
             return DownloadResult.Update;
         }
 
-        public static Archive MaybeProxy(Archive archive)
+        public static async ValueTask<Archive> MaybeProxy(Archive archive)
         {
             if (archive.State is (not GoogleDriveDownloader.State 
                 and not MegaDownloader.State 
@@ -191,6 +191,9 @@ namespace Wabbajack.Lib.Downloaders
                 and not ManualDownloader.State))
                 return archive;
 
+            if (archive.State is ManualDownloader.State ms && !await ProxyHas(new Uri(ms.Url)))
+                return archive;
+
             var uri = archive.State.GetManifestURL(archive);
             var hash = archive.Hash != default ? $"&hash={archive.Hash.ToHex()}" : "";
             Utils.Log($"Downloading via proxy ({Encoding.UTF8.GetBytes(uri!).xxHash().ToHex()}) {uri}");
diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj
index a662db0e..68143797 100644
--- a/Wabbajack/Wabbajack.csproj
+++ b/Wabbajack/Wabbajack.csproj
@@ -6,8 +6,8 @@
     <UseWPF>true</UseWPF>
     <Platforms>x64</Platforms>
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
-      <AssemblyVersion>2.5.3.21</AssemblyVersion>
-      <FileVersion>2.5.3.21</FileVersion>
+      <AssemblyVersion>2.5.3.22</AssemblyVersion>
+      <FileVersion>2.5.3.22</FileVersion>
     <Copyright>Copyright © 2019-2022</Copyright>
     <Description>An automated ModList installer</Description>
     <PublishReadyToRun>true</PublishReadyToRun>