diff --git a/csharp/App/VrmGrabber/Controller.cs b/csharp/App/VrmGrabber/Controller.cs
index ea79c157a..5465152d7 100644
--- a/csharp/App/VrmGrabber/Controller.cs
+++ b/csharp/App/VrmGrabber/Controller.cs
@@ -126,7 +126,7 @@ public class Controller : ControllerBase
         var data = new
         {
             inst = installsForHtml,
-            serverIp = "10.2.0.1",
+            serverIp = "10.2.0.1",      //TODO MAKE ME DYNAMIC
             firmwareVersion = FirmwareVersion
         };
 
@@ -158,7 +158,7 @@ public class Controller : ControllerBase
         return new AcceptedResult();
     }
 
-    private void SendNewBatteryFirmware(String installationIp)
+    private static void SendNewBatteryFirmware(String installationIp)
     {
         Cli.Wrap("scp")
             .WithArguments($@"{FirmwareVersion}.bin")
diff --git a/csharp/App/VrmGrabber/Database/Db.cs b/csharp/App/VrmGrabber/Database/Db.cs
index e390ef5c0..c638ecb3d 100644
--- a/csharp/App/VrmGrabber/Database/Db.cs
+++ b/csharp/App/VrmGrabber/Database/Db.cs
@@ -90,6 +90,9 @@ public static partial class Db
                 await NumberOfBatteries(ip[0], ip[1]),
                 await BatteryFirmwareVersion(ip[0], ip[1]));
             
+            if (ip[0] != "Unknown")
+                await UpdateInstallationName(installation, ip[0]);
+            
             if (GetInstallationByIdentifier(installation.Identifier) == null)
             {
                 Create(updatedInstallation);
@@ -165,10 +168,9 @@ public static partial class Db
 
             var ip = await VpnInfo.LookUpIp(i.Identifier, details.MachineSerial()) ?? "Unknown";
 
-            if (ip != "Unknown")
-                await UpdateInstallationName(i, ip);
+            var installationDetails = new InstallationDetails(ip, details);
 
-            return new InstallationDetails(ip, details);
+            return installationDetails;
         }
         catch (Exception e)
         {
diff --git a/csharp/App/VrmGrabber/db.sqlite b/csharp/App/VrmGrabber/db.sqlite
index 49c9c28a7..0b57a99aa 100644
Binary files a/csharp/App/VrmGrabber/db.sqlite and b/csharp/App/VrmGrabber/db.sqlite differ