diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 348f841..8486139 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -23,9 +23,9 @@ jobs:
         msbuild BrowserStackLocalIntegrationTests -t:restore -p:Configuration=Release
         msbuild BrowserStackLocalIntegrationTests -t:build -p:Configuration=Release
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 3.1.301
+        dotnet-version: 7.0.410
     - name: Run Integration Tests
       env:
         BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8ee677c..c7f79c6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,9 +23,9 @@ jobs:
         msbuild BrowserStackLocalIntegrationTests -t:restore -p:Configuration=Release
         msbuild BrowserStackLocalIntegrationTests -t:build -p:Configuration=Release
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 3.1.301
+        dotnet-version: 7.0.410
     - name: Run Integration Tests
       env:
         BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
diff --git a/BrowserStackLocal/BrowserStackLocal Unit Tests/BrowserStackLocal Unit Tests.csproj b/BrowserStackLocal/BrowserStackLocal Unit Tests/BrowserStackLocal Unit Tests.csproj
index cdc5f3d..75629c6 100644
--- a/BrowserStackLocal/BrowserStackLocal Unit Tests/BrowserStackLocal Unit Tests.csproj	
+++ b/BrowserStackLocal/BrowserStackLocal Unit Tests/BrowserStackLocal Unit Tests.csproj	
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>BrowserStackLocal_Unit_Tests</RootNamespace>
     <AssemblyName>BrowserStackLocal Unit Tests</AssemblyName>
-    <TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Title>BrowserStackLocal Unit Tests</Title>
     <Product>BrowserStackLocal Unit Tests</Product>
@@ -18,15 +18,10 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
     <Reference Include="BrowserStackLocal">
-      <HintPath>..\BrowserStackLocal\bin\Debug\net20\BrowserStackLocal.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <Reference Include="BrowserStackLocal">
-      <HintPath>..\BrowserStackLocal\bin\Debug\netstandard2.0\BrowserStackLocal.dll</HintPath>
+      <HintPath>..\BrowserStackLocal\bin\$(Configuration)\net7.0\BrowserStackLocal.dll</HintPath>
     </Reference>
   </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -36,4 +31,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/BrowserStackLocal/BrowserStackLocal Unit Tests/BrowserStackTunnelTests.cs b/BrowserStackLocal/BrowserStackLocal Unit Tests/BrowserStackTunnelTests.cs
index 2a32216..ad13e95 100644
--- a/BrowserStackLocal/BrowserStackLocal Unit Tests/BrowserStackTunnelTests.cs	
+++ b/BrowserStackLocal/BrowserStackLocal Unit Tests/BrowserStackTunnelTests.cs	
@@ -30,14 +30,14 @@ public void TestInitialState()
     public void TestBinaryPathIsSet()
     {
       tunnel = new TunnelClass();
-      tunnel.addBinaryPath("dummyPath");
+      tunnel.addBinaryPath("dummyPath", "");
       Assert.AreEqual(tunnel.getBinaryAbsolute(), "dummyPath");
     }
     [TestMethod]
     public void TestBinaryPathOnNull()
     {
       tunnel = new TunnelClass();
-      tunnel.addBinaryPath(null);
+      tunnel.addBinaryPath(null, "");
       string expectedPath = Path.Combine(homepath, ".browserstack");
       expectedPath = Path.Combine(expectedPath, binaryName);
       Assert.AreEqual(tunnel.getBinaryAbsolute(), expectedPath);
@@ -46,7 +46,7 @@ public void TestBinaryPathOnNull()
     public void TestBinaryPathOnEmpty()
     {
       tunnel = new TunnelClass();
-      tunnel.addBinaryPath("");
+      tunnel.addBinaryPath("", "");
       string expectedPath = Path.Combine(homepath, ".browserstack");
       expectedPath = Path.Combine(expectedPath, binaryName);
       Assert.AreEqual(tunnel.getBinaryAbsolute(), expectedPath);
@@ -56,7 +56,7 @@ public void TestBinaryPathOnFallback()
     {
       string expectedPath = "dummyPath";
       tunnel = new TunnelClass();
-      tunnel.addBinaryPath("dummyPath");
+      tunnel.addBinaryPath("dummyPath", "");
       Assert.AreEqual(tunnel.getBinaryAbsolute(), expectedPath);
 
       tunnel.fallbackPaths();
@@ -78,7 +78,7 @@ public void TestBinaryPathOnFallback()
     public void TestBinaryPathOnNoMoreFallback()
     {
       tunnel = new TunnelClass();
-      tunnel.addBinaryPath("dummyPath");
+      tunnel.addBinaryPath("dummyPath", "");
       tunnel.fallbackPaths();
       tunnel.fallbackPaths();
       tunnel.fallbackPaths();
diff --git a/BrowserStackLocal/BrowserStackLocal Unit Tests/LocalTests.cs b/BrowserStackLocal/BrowserStackLocal Unit Tests/LocalTests.cs
index ff03d1e..8be3eb6 100644
--- a/BrowserStackLocal/BrowserStackLocal Unit Tests/LocalTests.cs	
+++ b/BrowserStackLocal/BrowserStackLocal Unit Tests/LocalTests.cs	
@@ -107,7 +107,7 @@ public void TestWorksForBinaryPath()
       tunnelMock.Setup(mock => mock.Run("dummyKey", "", logAbsolute, "start"));
       local.setTunnel(tunnelMock.Object);
       local.start(options);
-      tunnelMock.Verify(mock => mock.addBinaryPath("dummyPath"), Times.Once);
+      tunnelMock.Verify(mock => mock.addBinaryPath("dummyPath", ""), Times.Once);
       tunnelMock.Verify(mock => mock.addBinaryArguments(It.IsRegex("-logFile \"" + logAbsolute + "\" .*")), Times.Once());
       tunnelMock.Verify(mock => mock.Run("dummyKey", "", logAbsolute, "start"), Times.Once());
       local.stop();
@@ -129,7 +129,7 @@ public void TestWorksWithBooleanOptions()
       tunnelMock.Setup(mock => mock.Run("dummyKey", "", logAbsolute, "start"));
       local.setTunnel(tunnelMock.Object);
       local.start(options);
-      tunnelMock.Verify(mock => mock.addBinaryPath(""), Times.Once);
+      tunnelMock.Verify(mock => mock.addBinaryPath("", ""), Times.Once);
       tunnelMock.Verify(mock => mock.addBinaryArguments(It.IsRegex("-vvv.*-force.*-forcelocal.*-forceproxy.*-onlyAutomate.*")), Times.Once());
       tunnelMock.Verify(mock => mock.Run("dummyKey", "", logAbsolute, "start"), Times.Once());
       local.stop();
@@ -152,7 +152,7 @@ public void TestWorksWithValueOptions()
       tunnelMock.Setup(mock =>mock.Run("dummyKey", "", logAbsolute, "start"));
       local.setTunnel(tunnelMock.Object);
       local.start(options);
-      tunnelMock.Verify(mock => mock.addBinaryPath(""), Times.Once);
+      tunnelMock.Verify(mock => mock.addBinaryPath("", ""), Times.Once);
       tunnelMock.Verify(mock => mock.addBinaryArguments(
         It.IsRegex("-localIdentifier.*dummyIdentifier.*dummyHost.*-proxyHost.*dummyHost.*-proxyPort.*dummyPort.*-proxyUser.*dummyUser.*-proxyPass.*dummyPass.*")
         ), Times.Once());
@@ -175,7 +175,7 @@ public void TestWorksWithCustomOptions()
       tunnelMock.Setup(mock => mock.Run("dummyKey", "", logAbsolute, "start"));
       local.setTunnel(tunnelMock.Object);
       local.start(options);
-      tunnelMock.Verify(mock => mock.addBinaryPath(""), Times.Once);
+      tunnelMock.Verify(mock => mock.addBinaryPath("", ""), Times.Once);
       tunnelMock.Verify(mock => mock.addBinaryArguments(
         It.IsRegex("-customBoolKey1.*-customBoolKey2.*-customKey1.*customValue1.*-customKey2.*customValue2.*")
         ), Times.Once());
@@ -200,7 +200,7 @@ public void TestCallsFallbackOnFailure()
       });
       local.setTunnel(tunnelMock.Object);
       local.start(options);
-      tunnelMock.Verify(mock => mock.addBinaryPath(""), Times.Once);
+      tunnelMock.Verify(mock => mock.addBinaryPath("", ""), Times.Once);
       tunnelMock.Verify(mock => mock.addBinaryArguments(It.IsRegex("-logFile \"" + logAbsolute + "\" .*")), Times.Once());
       tunnelMock.Verify(mock => mock.Run("dummyKey", "", logAbsolute, "start"), Times.Exactly(2));
       tunnelMock.Verify(mock => mock.fallbackPaths(), Times.Once());
@@ -219,7 +219,7 @@ public void TestKillsTunnel()
       local.setTunnel(tunnelMock.Object);
       local.start(options);
       local.stop();
-      tunnelMock.Verify(mock => mock.addBinaryPath(""), Times.Once);
+      tunnelMock.Verify(mock => mock.addBinaryPath("", ""), Times.Once);
       tunnelMock.Verify(mock => mock.addBinaryArguments(It.IsRegex("-logFile \"" + logAbsolute + "\" .*")), Times.Once());
       tunnelMock.Verify(mock => mock.Run("dummyKey", "", logAbsolute, "start"), Times.Once());
     }
diff --git a/BrowserStackLocal/BrowserStackLocal/BrowserStackLocal.csproj b/BrowserStackLocal/BrowserStackLocal/BrowserStackLocal.csproj
index 7711dbb..688943d 100644
--- a/BrowserStackLocal/BrowserStackLocal/BrowserStackLocal.csproj
+++ b/BrowserStackLocal/BrowserStackLocal/BrowserStackLocal.csproj
@@ -2,14 +2,14 @@
   <PropertyGroup>
     <RootNamespace>BrowserStack</RootNamespace>
     <AssemblyName>BrowserStackLocal</AssemblyName>
-    <TargetFrameworks>net20;netstandard2.0</TargetFrameworks>
+    <TargetFramework>net7.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Title>BrowserStackLocal</Title>
     <Product>BrowserStackLocal</Product>
     <Description>C# Bindings for BrowserStack Local</Description>
-    <Version>2.4.0</Version>
-    <AssemblyVersion>2.4.0</AssemblyVersion>
-    <FileVersion>2.4.0</FileVersion>
+    <Version>3.0.0</Version>
+    <AssemblyVersion>3.0.0</AssemblyVersion>
+    <FileVersion>3.0.0</FileVersion>
     <Authors>BrowserStack</Authors>
     <Company>BrowserStack</Company>
     <Copyright>Copyright ©  2016</Copyright>
@@ -18,9 +18,6 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="MIT-LICENSE.txt" Pack="true" PackagePath="" />
   </ItemGroup>
diff --git a/BrowserStackLocal/BrowserStackLocal/BrowserStackTunnel.cs b/BrowserStackLocal/BrowserStackLocal/BrowserStackTunnel.cs
index 40ed6c1..4134cc2 100644
--- a/BrowserStackLocal/BrowserStackLocal/BrowserStackTunnel.cs
+++ b/BrowserStackLocal/BrowserStackLocal/BrowserStackTunnel.cs
@@ -8,6 +8,12 @@
 using System.Security.Principal;
 using Newtonsoft.Json.Linq;
 
+
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
 namespace BrowserStack
 {
   public enum LocalState { Idle, Connecting, Connected, Error, Disconnected };
@@ -16,7 +22,11 @@ public class BrowserStackTunnel : IDisposable
   {
     static readonly string uname = Util.GetUName();
     static readonly string binaryName = GetBinaryName();
-    static readonly string downloadURL = "https://www.browserstack.com/local-testing/downloads/binaries/" + binaryName;
+
+    private static string userAgent = "";
+    private string sourceUrl = null;
+    private bool isFallbackEnabled = false;
+    private Exception downloadFailureException = null;
 
     static readonly string homepath = !IsWindows() ?
                                         Environment.GetFolderPath(Environment.SpecialFolder.Personal) :
@@ -41,7 +51,7 @@ static bool IsDarwin(string osName)
     {
       return osName.Contains("darwin");
     }
-    
+
 
     static bool IsWindows()
     {
@@ -84,8 +94,15 @@ static string GetBinaryName()
       return "BrowserStackLocal.exe";
     }
 
-    public virtual void addBinaryPath(string binaryAbsolute)
+    public virtual void addBinaryPath(string binaryAbsolute, string accessKey, bool fallbackEnabled = false, Exception failureException = null)
     {
+      if (basePathsIndex == -1)
+      {
+        /* Called at most twice (primary & a fallback) */
+        isFallbackEnabled = fallbackEnabled;
+        downloadFailureException = failureException;
+        fetchSourceUrl(accessKey);
+      }
       if (binaryAbsolute == null || binaryAbsolute.Trim().Length == 0)
       {
         binaryAbsolute = Path.Combine(basePaths[++basePathsIndex], binaryName);
@@ -102,14 +119,19 @@ public virtual void addBinaryArguments(string binaryArguments)
       this.binaryArguments = binaryArguments;
     }
 
-    public BrowserStackTunnel()
+    public BrowserStackTunnel(string userAgentParam)
     {
+      userAgent = userAgentParam;
       localState = LocalState.Idle;
       output = new StringBuilder();
     }
 
     public virtual void fallbackPaths()
     {
+      if (File.Exists(binaryAbsolute))
+      {
+        File.Delete(binaryAbsolute);
+      }
       if (basePathsIndex >= basePaths.Length - 1)
       {
         throw new Exception("Binary not found or failed to launch. Make sure that BrowserStackLocal is not already running.");
@@ -121,7 +143,7 @@ public virtual void fallbackPaths()
     public void modifyBinaryPermission()
     {
       if (!IsWindows())
-       {
+      {
         try
         {
           using (Process proc = Process.Start("/bin/bash", $"-c \"chmod 0755 {this.binaryAbsolute}\""))
@@ -143,16 +165,58 @@ public void modifyBinaryPermission()
       }
     }
 
+    private string fetchSourceUrl(string accessKey)
+    {
+      var url = "https://local.browserstack.com/binary/api/v1/endpoint";
+
+      using (var client = new HttpClient())
+      {
+        var data = new Dictionary<string, object>
+        {
+            { "auth_token", accessKey }
+        };
+
+        if (isFallbackEnabled)
+        {
+          data["error_message"] = downloadFailureException.Message;
+        }
+
+        var jsonData = JsonConvert.SerializeObject(data);
+        var content = new StringContent(jsonData, Encoding.UTF8, "application/json");
+
+        client.DefaultRequestHeaders.Add("User-Agent", userAgent);
+        if (isFallbackEnabled)
+        {
+            client.DefaultRequestHeaders.Add("X-Local-Fallback-Cloudflare", "true");
+        }
+
+        var response = client.PostAsync(url, content).Result;
+
+        response.EnsureSuccessStatusCode();
+
+        var responseString = response.Content.ReadAsStringAsync().Result;
+
+        var jsonResponse = JObject.Parse(responseString);
+
+        if (jsonResponse["error"] != null)
+        {
+          throw new Exception((string)jsonResponse["error"]);
+        }
+        
+        sourceUrl = jsonResponse["data"]?["endpoint"]?.ToString();
+        return sourceUrl;
+      }
+    }
+
     public void downloadBinary()
     {
       string binaryDirectory = Path.Combine(this.binaryAbsolute, "..");
-      //string binaryAbsolute = Path.Combine(binaryDirectory, binaryName);
 
       Directory.CreateDirectory(binaryDirectory);
 
       using (var client = new WebClient())
       {
-        client.DownloadFile(downloadURL, this.binaryAbsolute);
+        client.DownloadFile(sourceUrl + "/" + binaryName, this.binaryAbsolute);
       }
 
       if (!File.Exists(binaryAbsolute))
diff --git a/BrowserStackLocal/BrowserStackLocal/Local.cs b/BrowserStackLocal/BrowserStackLocal/Local.cs
index 5398c08..6c57251 100644
--- a/BrowserStackLocal/BrowserStackLocal/Local.cs
+++ b/BrowserStackLocal/BrowserStackLocal/Local.cs
@@ -14,6 +14,9 @@ public class Local
     private string argumentString = "";
     private string customBinaryPath = "";
     private string bindingVersion = "";
+    private string userAgent = "browserstack-local-csharp";
+    private bool isFallbackEnabled = false;
+    private Exception downloadFailureException = null;
         
     protected BrowserStackTunnel tunnel = null;
     private static KeyValuePair<string, string> emptyStringPair = new KeyValuePair<string, string>();
@@ -144,11 +147,59 @@ public static string GetVersionStringFromAssemblyEmbedded(string pAssemblyDispla
     public Local()
     {
        bindingVersion = GetVersionStringFromAssemblyEmbedded("BrowserStackLocal");
-       tunnel = new BrowserStackTunnel();
+       userAgent = userAgent + "/" + bindingVersion;
+       tunnel = new BrowserStackTunnel(userAgent);
     }
-    public void start(List<KeyValuePair<string, string>> options)
+
+    private void DownloadVerifyAndRunBinary()
     {
       tunnel.basePathsIndex = -1;
+      tunnel.addBinaryPath(customBinaryPath, accessKey, isFallbackEnabled, downloadFailureException);
+      try
+      {
+        while (true)
+        {
+          bool except = false;
+          try
+          {
+            tunnel.Run(accessKey, folder, customLogPath, "start");
+          }
+          catch (System.ComponentModel.Win32Exception)
+          {
+            except = true;
+          }
+          catch (Exception e)
+          {
+            except = true;
+            Console.WriteLine(e.ToString());
+          }
+          if (except)
+          {
+            tunnel.fallbackPaths();
+          }
+          else
+          {
+            break;
+          }
+        }
+      }
+      catch (Exception err)
+      {
+        if (!isFallbackEnabled)
+        {
+          isFallbackEnabled = true;
+          downloadFailureException = err;
+          DownloadVerifyAndRunBinary();
+        }
+        else
+        {
+          throw err;
+        }
+      }
+    }
+
+    public void start(List<KeyValuePair<string, string>> options)
+    {
       foreach (KeyValuePair<string, string> pair in options)
       {
         string key = pair.Key;
@@ -174,33 +225,9 @@ public void start(List<KeyValuePair<string, string>> options)
 
       argumentString += "-logFile \"" + customLogPath + "\" ";
       argumentString += "--source \"c-sharp:" + bindingVersion + "\" ";
-      tunnel.addBinaryPath(customBinaryPath);
       tunnel.addBinaryArguments(argumentString);
-      while (true)
-      {
-        bool except = false;
-        try
-        {
-          tunnel.Run(accessKey, folder, customLogPath, "start");
-        }
-        catch (System.ComponentModel.Win32Exception)
-        {
-          except = true;
-        }
-        catch (Exception e)
-        {
-          except = true;
-          Console.WriteLine(e.ToString());
-        }
-        if (except)
-        {
-          tunnel.fallbackPaths();
-        }
-        else
-        {
-          break;
-        }
-      }
+
+      DownloadVerifyAndRunBinary();
     }
 
     public void stop()
diff --git a/BrowserStackLocal/BrowserStackLocalIntegrationTests/BrowserStackLocalIntegrationTests.csproj b/BrowserStackLocal/BrowserStackLocalIntegrationTests/BrowserStackLocalIntegrationTests.csproj
index 1330776..54542d7 100644
--- a/BrowserStackLocal/BrowserStackLocalIntegrationTests/BrowserStackLocalIntegrationTests.csproj
+++ b/BrowserStackLocal/BrowserStackLocalIntegrationTests/BrowserStackLocalIntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -12,16 +12,11 @@
     <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
     <Reference Include="BrowserStackLocal">
-      <HintPath>..\BrowserStackLocal\bin\$(Configuration)\net20\BrowserStackLocal.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <Reference Include="BrowserStackLocal">
-      <HintPath>..\BrowserStackLocal\bin\$(Configuration)\netstandard2.0\BrowserStackLocal.dll</HintPath>
+      <HintPath>..\BrowserStackLocal\bin\$(Configuration)\net7.0\BrowserStackLocal.dll</HintPath>
     </Reference>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/BrowserStackLocalExample/BrowserStackExample/BrowserStackExample.csproj b/BrowserStackLocalExample/BrowserStackExample/BrowserStackExample.csproj
index f4bb522..fc2e2b6 100644
--- a/BrowserStackLocalExample/BrowserStackExample/BrowserStackExample.csproj
+++ b/BrowserStackLocalExample/BrowserStackExample/BrowserStackExample.csproj
@@ -1,94 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{9297DCCC-AE88-4E12-934A-B2BEA4864B49}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>BrowserStackExample</RootNamespace>
     <AssemblyName>BrowserStackExample</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Selenium.WebDriver" Version="4.19.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="BrowserStackLocal">
-      <HintPath>..\..\BrowserStackLocal\BrowserStackLocal\bin\Debug\net20\BrowserStackLocal.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WebDriver, Version=2.52.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.WebDriver.2.52.0\lib\net40\WebDriver.dll</HintPath>
+      <HintPath>..\..\BrowserStackLocal\BrowserStackLocal\bin\Debug\net7.0\BrowserStackLocal.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Example.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Service References\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/BrowserStackLocalExample/BrowserStackExample/Example.cs b/BrowserStackLocalExample/BrowserStackExample/Example.cs
index 9eac3e3..28e410f 100644
--- a/BrowserStackLocalExample/BrowserStackExample/Example.cs
+++ b/BrowserStackLocalExample/BrowserStackExample/Example.cs
@@ -2,6 +2,7 @@
 using BrowserStack;
 using System.Collections.Generic;
 using OpenQA.Selenium;
+using OpenQA.Selenium.Chrome;
 using OpenQA.Selenium.Remote;
 
 namespace BrowserStackExample
@@ -10,36 +11,44 @@ class Example
   {
     static void Main(string[] args)
     {
+      // Start BrowserStack Local
       Local local = new Local();
-
-      List<KeyValuePair<string, string>> options = new List<KeyValuePair<string, string>>() {
+      var bsLocalArgs = new List<KeyValuePair<string, string>>()
+      {
         new KeyValuePair<string, string>("key", BROWSERSTACK_ACCESS_KEY),
-        //new KeyValuePair<string, string>("localIdentifier", "identifier"),
-        //new KeyValuePair<string, string>("f", "C:\\Users\\Admin\\Desktop\\"),
-        new KeyValuePair<string, string>("onlyAutomate", "true"),
-        new KeyValuePair<string, string>("verbose", "true"),
         new KeyValuePair<string, string>("forcelocal", "true"),
+        new KeyValuePair<string, string>("verbose", "true"),
         new KeyValuePair<string, string>("binarypath", "C:\\Users\\Admin\\Desktop\\BrowserStackLocal.exe"),
         new KeyValuePair<string, string>("logfile", "C:\\Users\\Admin\\Desktop\\local.log"),
       };
-      local.start(options);
-      
-      // Run WebDriver Tests
-      IWebDriver driver;
-      DesiredCapabilities capability = DesiredCapabilities.Chrome();
-      capability.SetCapability("browserstack.user", BROWSERSTACK_USERNAME);
-      capability.SetCapability("browserstack.key", BROWSERSTACK_ACCESS_KEY);
-      //capability.SetCapability("browserstack.localIdentifier", "identifier");
-      capability.SetCapability("browserstack.local", true);
-      capability.SetCapability("build", "build");
+      local.start(bsLocalArgs);
 
-      driver = new RemoteWebDriver(
-        new Uri("http://hub.browserstack.com/wd/hub/"), capability
+      // Define BrowserStack capabilities
+      var browserstackOptions = new Dictionary<string, object>
+      {
+          { "userName", BROWSERSTACK_USERNAME },
+          { "accessKey", BROWSERSTACK_ACCESS_KEY },
+          { "local", "true" },
+          { "build", "build" }
+      };
+
+      // Set up ChromeOptions
+      ChromeOptions chromeOptions = new ChromeOptions();
+      chromeOptions.BrowserVersion = "latest";
+      chromeOptions.PlatformName = "Windows 10";
+      chromeOptions.AddAdditionalOption("bstack:options", browserstackOptions);
+
+      // Launch Remote WebDriver
+      IWebDriver driver = new RemoteWebDriver(
+          new Uri("https://hub.browserstack.com/wd/hub"),
+          chromeOptions
       );
+
+      // Run your test
       driver.Navigate().GoToUrl("http://www.google.com");
       Console.WriteLine(driver.Title);
 
-      IWebElement query = driver.FindElement(By.Name("q"));
+      var query = driver.FindElement(By.Name("q"));
       query.SendKeys("Browserstack");
       query.Submit();
       Console.WriteLine(driver.Title);
diff --git a/BrowserStackLocalExample/BrowserStackExample/packages.config b/BrowserStackLocalExample/BrowserStackExample/packages.config
index d4dee4a..d085f87 100644
--- a/BrowserStackLocalExample/BrowserStackExample/packages.config
+++ b/BrowserStackLocalExample/BrowserStackExample/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Selenium.WebDriver" version="2.52.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
+  <package id="Selenium.WebDriver" version="4.19.0" targetFramework="net7.0" />
+</packages>

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/browserstack/browserstack-local-csharp/pull/55.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/browserstack/browserstack-local-csharp/pull/55.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/browserstack/browserstack-local-csharp/pull/55.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/browserstack/browserstack-local-csharp/pull/55.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>