diff --git a/src/Baballonia.Desktop/Calibration/ICalibrationRoutine.cs b/src/Baballonia.Desktop/Calibration/ICalibrationRoutine.cs
index d52a6057..83c682f7 100644
--- a/src/Baballonia.Desktop/Calibration/ICalibrationRoutine.cs
+++ b/src/Baballonia.Desktop/Calibration/ICalibrationRoutine.cs
@@ -304,14 +304,9 @@ public override Frame AddFrame(Mat[] images)
     }
 }
 
-public class CommandDispatchStep : ICalibrationStep
+public class CommandDispatchStep(string name) : ICalibrationStep
 {
-    public string Name { get; }
-
-    public CommandDispatchStep(string name)
-    {
-        Name = name;
-    }
+    public string Name { get; } = name;
 
     public Task ExecuteAsync(OverlayMessageDispatcher dispatcher, CancellationToken ct)
     {
@@ -320,27 +315,21 @@ public Task ExecuteAsync(OverlayMessageDispatcher dispatcher, CancellationToken
     }
 }
 
-public class TrainerCalibrationStep : ICalibrationStep
+public class TrainerCalibrationStep(ITrainerService overlayTrainer) : ICalibrationStep
 {
-    public string Name { get; }
-    private readonly ITrainerService _trainer;
-
-    public TrainerCalibrationStep(ITrainerService overlayTrainer)
-    {
-        _trainer = overlayTrainer;
-        Name = "trainer";
-    }
+    public string Name => "trainer";
+    private readonly ITrainerService _trainer = overlayTrainer;
 
     public async Task ExecuteAsync(OverlayMessageDispatcher dispatcher, CancellationToken ct)
     {
         dispatcher.Dispatch(new RunVariableLenghtRoutinePacket(Name, TimeSpan.FromSeconds(120)));
-        var onProgresHandler = (TrainerProgressReportPacket packet) => { dispatcher.Dispatch(packet); };
-        _trainer.OnProgress += onProgresHandler;
+        var onProgressHandler = (TrainerProgressReportPacket packet) => { dispatcher.Dispatch(packet); };
+        _trainer.OnProgress += onProgressHandler;
         _trainer.RunTraining(Path.Combine(Utils.ModelDataDirectory, "user_cal.bin"),
             Path.Combine(Utils.ModelDataDirectory, "tuned_temporal_eye_tracking_latest.onnx"));
         await _trainer.WaitAsync();
 
-        _trainer.OnProgress -= onProgresHandler;
+        _trainer.OnProgress -= onProgressHandler;
     }
 }
 
@@ -365,7 +354,7 @@ public BaseEyeCaptureStep Create(string name, uint flags, TimeSpan time,
 
 public class MergeBinsStep : ICalibrationStep
 {
-    public string Name { get; } = "bin_merger";
+    public string Name => "bin_merger";
     private string[] _binNames;
 
     public MergeBinsStep(params string[] binNames)
@@ -414,36 +403,12 @@ public IEnumerable<ICalibrationStep> BasicAllCalibration()
                 CaptureFlags.FLAG_VERSION_BIT1,
                 TimeSpan.FromSeconds(20), lid: 0
             ),
-            // steps.Add(new BaseTutorialStep("dilationtutorial"));
-            // steps.Add(_eyeCaptureStepFactory.Create("dilation",
-            //     CaptureFlags.FLAG_GOOD_DATA | CaptureFlags.FLAG_DILATION_BLACK));
-
-            new BaseTutorialStep("widentutorial", TimeSpan.FromSeconds(10)),
-            _eyeCaptureStepFactory.Create("widen",
-                CaptureFlags.FLAG_GOOD_DATA | CaptureFlags.FLAG_VERSION_BIT1, TimeSpan.FromSeconds(20), widen: 1, lid: 1),
-
-            new BaseTutorialStep("squinttutorial", TimeSpan.FromSeconds(10)),
-            _eyeCaptureStepFactory.Create("squint",
-                CaptureFlags.FLAG_GOOD_DATA | CaptureFlags.FLAG_VERSION_BIT1, TimeSpan.FromSeconds(20), squint: 1, lid: 1),
-
-            new BaseTutorialStep("browtutorial", TimeSpan.FromSeconds(10)),
-            _eyeCaptureStepFactory.Create("brow",
-                CaptureFlags.FLAG_GOOD_DATA | CaptureFlags.FLAG_VERSION_BIT1, TimeSpan.FromSeconds(20), browAngry: 1, lid: 1),
-            // steps.Add(new BaseTutorialStep("covergencetutorial"));
-            // steps.Add(_eyeCaptureStepFactory.Create("covergence",
-            //     CaptureFlags.FLAG_GOOD_DATA | CaptureFlags.FLAG_WHATEVER_NOT_IMPLEMENTED));
-
-            new MergeBinsStep("gaze.bin", "blink.bin", "widen.bin", "squint.bin", "brow.bin"),
+
+            new MergeBinsStep("gaze.bin", "blink.bin"),
             new TrainerCalibrationStep(_trainer),
             new CommandDispatchStep("close")
 
         ];
-        // steps.Add(new BaseTutorialStep("dilationtutorial"));
-        // steps.Add(_eyeCaptureStepFactory.Create("dilation",
-        //     CaptureFlags.FLAG_GOOD_DATA | CaptureFlags.FLAG_DILATION_BLACK));
-        // steps.Add(new BaseTutorialStep("covergencetutorial"));
-        // steps.Add(_eyeCaptureStepFactory.Create("covergence",
-        //     CaptureFlags.FLAG_GOOD_DATA | CaptureFlags.FLAG_WHATEVER_NOT_IMPLEMENTED));
 
         return steps;
     }
@@ -462,19 +427,7 @@ public IEnumerable<ICalibrationStep> BasicAllCalibrationQuick()
                 TimeSpan.FromSeconds(20)
             ),
 
-            new BaseTutorialStep("widentutorial", TimeSpan.FromSeconds(4)),
-            _eyeCaptureStepFactory.Create("widen",
-                CaptureFlags.FLAG_GOOD_DATA | CaptureFlags.FLAG_VERSION_BIT1, TimeSpan.FromSeconds(20)),
-
-            new BaseTutorialStep("squinttutorial", TimeSpan.FromSeconds(4)),
-            _eyeCaptureStepFactory.Create("squint",
-                CaptureFlags.FLAG_GOOD_DATA | CaptureFlags.FLAG_VERSION_BIT1, TimeSpan.FromSeconds(20)),
-
-            new BaseTutorialStep("browtutorial", TimeSpan.FromSeconds(4)),
-            _eyeCaptureStepFactory.Create("brow",
-                CaptureFlags.FLAG_GOOD_DATA | CaptureFlags.FLAG_VERSION_BIT1, TimeSpan.FromSeconds(20)),
-
-            new MergeBinsStep("gaze.bin", "blink.bin", "widen.bin", "squint.bin", "brow.bin"),
+            new MergeBinsStep("gaze.bin", "blink.bin"),
             new TrainerCalibrationStep(_trainer),
             new CommandDispatchStep("close")
 
diff --git a/src/Baballonia.Desktop/main.nsi b/src/Baballonia.Desktop/main.nsi
index dd57da89..049347fc 100644
--- a/src/Baballonia.Desktop/main.nsi
+++ b/src/Baballonia.Desktop/main.nsi
@@ -11,7 +11,7 @@
   !define NAME "Baballonia"
   !define APPFILE "Baballonia.Desktop.exe"
   !define PUBLISHER "dfgHiatus - Paradigm Reality Enhancement Laboratories"
-  !define VERSION "1.1.0.8"
+  !define VERSION "1.1.0.9"
   !define SLUG "${NAME} v${VERSION}"
 
 ;--------------------------------
diff --git a/src/Baballonia/App.axaml.cs b/src/Baballonia/App.axaml.cs
index 941daf42..4eeff068 100644
--- a/src/Baballonia/App.axaml.cs
+++ b/src/Baballonia/App.axaml.cs
@@ -147,6 +147,7 @@ public override void OnFrameworkInitializationCompleted()
             {
                 services.AddSingleton<ICommandSenderFactory, CommandSenderFactory>();
                 services.AddSingleton<ICommandSender, SerialCommandSender>();
+                services.AddSingleton<IUsbService, UsbService>();
                 services.AddSingleton<OpenVRService>();
                 services.AddTransient<VrcViewModel>();
                 services.AddTransient<VrcView>();
diff --git a/src/Baballonia/Baballonia.csproj b/src/Baballonia/Baballonia.csproj
index 159170ce..a0a2ad19 100644
--- a/src/Baballonia/Baballonia.csproj
+++ b/src/Baballonia/Baballonia.csproj
@@ -7,8 +7,8 @@
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	<NoWarn>CS8618;CS8509;CS0067;CS8613;CS8622;MVVMTK0034</NoWarn>
 	<Company>Paradigm Reality Enhancement Labs</Company>
-	<AssemblyVersion>1.1.0.8</AssemblyVersion>
-	<FileVersion>1.1.0.8</FileVersion>
+	<AssemblyVersion>1.1.0.9</AssemblyVersion>
+	<FileVersion>1.1.0.9</FileVersion>
     </PropertyGroup>
 
     <ItemGroup>
@@ -65,6 +65,7 @@
         <PackageReference Include="SoundFlow" Version="1.2.1" />
         <PackageReference Include="System.IO.Ports" Version="9.0.8" />
         <PackageReference Include="System.Management" Version="9.0.8" />
+        <PackageReference Include="Usb.Events" Version="11.1.1.1" />
         <PackageReference Include="VRChat.OSCQuery" Version="0.0.7" />
     </ItemGroup>
 
diff --git a/src/Baballonia/Contracts/IUsbService.cs b/src/Baballonia/Contracts/IUsbService.cs
new file mode 100644
index 00000000..7b7708d1
--- /dev/null
+++ b/src/Baballonia/Contracts/IUsbService.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Baballonia.Contracts;
+
+public interface IUsbService
+{
+    public event Action<string> OnUsbConnected;
+    public event Action<string> OnUsbDisconnected;
+}
diff --git a/src/Baballonia/Controls/DropOverlay.axaml b/src/Baballonia/Controls/DropOverlay.axaml
index 00744156..f81bf9b0 100644
--- a/src/Baballonia/Controls/DropOverlay.axaml
+++ b/src/Baballonia/Controls/DropOverlay.axaml
@@ -36,14 +36,17 @@
             TextWrapping="Wrap"
             Text="{x:Static assets:Resources.DropOverlay_Important_Header}" />
 
-          <TextBlock 
+          <TextBlock
             TextWrapping="Wrap"
-            Text="{x:Static assets:Resources.DropOverlay_Message}" />
+            Text="Project Babble now has a data sharing program to help us improve our eye and face tracking models. You can opt in or out anytime by visiting the settings page." />
 
           <Grid>
-            <CheckBox x:Name="WarningCheckbox" IsCheckedChanged="Changed" Content="{x:Static assets:Resources.DropOverlay_DontShowAgain}" />
+            <CheckBox
+              x:Name="EyeDataCheckbox"
+              IsCheckedChanged="Changed"
+              Content="Opt in" />
             <Button
-              Click="SecondWarningUnderstood"
+              Click="EyeDataOptInRead"
               Content="{x:Static assets:Resources.DropOverlay_Dismiss_Button}"
               CornerRadius="4"
               HorizontalAlignment="Right"
diff --git a/src/Baballonia/Controls/DropOverlay.axaml.cs b/src/Baballonia/Controls/DropOverlay.axaml.cs
index 89e48fb0..3edcfaf0 100644
--- a/src/Baballonia/Controls/DropOverlay.axaml.cs
+++ b/src/Baballonia/Controls/DropOverlay.axaml.cs
@@ -29,11 +29,12 @@ public bool IsOverlayVisible
 
     private void Changed(object? sender, RoutedEventArgs e)
     {
-        _localSettingsService.SaveSetting("SecondsWarningRead", WarningCheckbox.IsChecked);
+        _localSettingsService.SaveSetting("AppSettings_ShareEyeData", EyeDataCheckbox.IsChecked);
     }
 
-    private void SecondWarningUnderstood(object? sender, RoutedEventArgs e)
+    private void EyeDataOptInRead(object? sender, RoutedEventArgs e)
     {
+        _localSettingsService.SaveSetting("EyeDataOptInRead", true);
         IsOverlayVisible = false;
     }
 }
diff --git a/src/Baballonia/LocalSettings.json b/src/Baballonia/LocalSettings.json
index 309e53ef..8a1c9552 100644
--- a/src/Baballonia/LocalSettings.json
+++ b/src/Baballonia/LocalSettings.json
@@ -371,5 +371,7 @@
   "AppSettings_SteamVRAutoStart": false,
   "AppSettings_UseGPU": true,
   "AppSettings_CheckForUpdates": true,
+  "AppSettings_ShareEyeData": false,
+  "EyeDataOptInRead": false,
   "AppSettings_LogLevel": "Information"
 }
diff --git a/src/Baballonia/Services/DefaultInferenceRunner.cs b/src/Baballonia/Services/DefaultInferenceRunner.cs
index 9fde1899..dfcf6d0e 100644
--- a/src/Baballonia/Services/DefaultInferenceRunner.cs
+++ b/src/Baballonia/Services/DefaultInferenceRunner.cs
@@ -200,7 +200,7 @@ public float[] Run()
 
         using var results = _session.Run(inputs);
 
-        float[] output = OrganizeOutputShapes(results);
+        var output = results[0].AsEnumerable<float>().ToArray();
         OutputSize = output.Length;
         return output;
     }
@@ -220,50 +220,6 @@ public float[] Run()
         { "rightBrow", 9 }
     };
 
-    // Guarantee an expression's index by using named parameter values
-    private float[] OrganizeOutputShapes(IDisposableReadOnlyCollection<DisposableNamedOnnxValue> results)
-    {
-        // Is this model the face model?
-        var candidate = results[0].AsEnumerable<float>().ToArray();
-        if (candidate.Length == Utils.FaceRawExpressions)
-        {
-            return candidate;
-        }
-
-        // Else, is this an older eye model?
-        if (_isOldEyeModel)
-        {
-            return [];
-        }
-
-        // Else, order eye information using cached metadata
-        // Start by flattening new eye ONNX output
-        List<Tuple<string, float>> arKitExpressions = [];
-        int counter = 0;
-        foreach (var result in results)
-        {
-            var exps = result.AsEnumerable<float>().ToArray();
-            foreach (var exp in exps)
-            {
-                arKitExpressions.Add(new Tuple<string, float>(_outputExpressionNames[counter], exp));
-                counter++;
-            }
-        }
-
-        float[] output = new float[arKitExpressions.Count];
-        foreach (var expression in arKitExpressions)
-        {
-            var name = expression.Item1;
-            var value = expression.Item2;
-
-            if (OutputIndexMap.TryGetValue(name, out var index))
-            {
-                output[index] = value;
-            }
-        }
-
-        return output;
-    }
 
     public DenseTensor<float> GetInputTensor()
     {
diff --git a/src/Baballonia/Services/EyePipelineManager.cs b/src/Baballonia/Services/EyePipelineManager.cs
index 68899e93..a4664f82 100644
--- a/src/Baballonia/Services/EyePipelineManager.cs
+++ b/src/Baballonia/Services/EyePipelineManager.cs
@@ -64,33 +64,13 @@ private DefaultInferenceRunner CreateInference()
         var eyeModelName = _localSettings.ReadSetting<string>("EyeHome_EyeModel", defaultEyeModelName);
         var eyeModelPath = Path.Combine(AppContext.BaseDirectory, eyeModelName);
 
-        if (File.Exists(eyeModelPath))
-        {
-            var candidate = _inferenceFactory.Create(eyeModelPath);
-
-            // We need to set up the model and run it once to get the model's output size
-            candidate.Setup(eyeModelName);
-            candidate.Run();
-
-            // Get the output size of the model. If is different from our expected eye expression count,
-            // It is likely an old(er) model and will require a re-calibration
-            if (Utils.EyeRawExpressions == candidate.OutputSize)
-                return candidate;
-
-            _logger.LogInformation("Eye model output size {CandidateOutputSize} was different than expected {EyeRawExpressions}.",
-                candidate.OutputSize, Utils.EyeRawExpressions);
-            _logger.LogInformation("You likely have an old(er) model that only predicts gaze and blinking.");
-            _logger.LogInformation("Please re-calibrate to train a newer model on eyebrow angry, squint and wide!");
-        }
-        else
-        {
-            _logger.LogError("{} Does not exist, Loading default...", eyeModelPath);
-        }
+        if (File.Exists(eyeModelPath)) return _inferenceFactory.Create(eyeModelPath);
+        _logger.LogError("{} Does not exists, Loading default...", eyeModelPath);
 
         eyeModelName = defaultEyeModelName;
         eyeModelPath = Path.Combine(AppContext.BaseDirectory, eyeModelName);
 
-        return _inferenceFactory.Create(eyeModelPath);;
+        return _inferenceFactory.Create(eyeModelPath);
     }
 
 
diff --git a/src/Baballonia/Services/Inference/EyeProcessingPipeline.cs b/src/Baballonia/Services/Inference/EyeProcessingPipeline.cs
index d455fadc..bd409ca0 100644
--- a/src/Baballonia/Services/Inference/EyeProcessingPipeline.cs
+++ b/src/Baballonia/Services/Inference/EyeProcessingPipeline.cs
@@ -48,8 +48,10 @@ public EyeProcessingPipeline(IEyePipelineEventBus eyePipelineEventBus)
         if(inferenceResult == null)
             return null;
 
-        if(Filter != null)
+        if (Filter != null)
+        {
             inferenceResult = Filter.Filter(inferenceResult);
+        }
 
         ProcessExpressions(ref inferenceResult);
 
@@ -73,9 +75,9 @@ private bool ProcessExpressions(ref float[] arKitExpressions)
         var leftYaw = arKitExpressions[1] * mulV - mulV / 2;
         var leftLid = 1 - arKitExpressions[2];
 
-        var rightPitch = arKitExpressions[5] * mulY - mulY / 2;
-        var rightYaw = arKitExpressions[6] * mulV - mulV / 2;
-        var rightLid = 1 - arKitExpressions[7];
+        var rightPitch = arKitExpressions[3] * mulY - mulY / 2;
+        var rightYaw = arKitExpressions[4] * mulV - mulV / 2;
+        var rightLid = 1 - arKitExpressions[5];
 
         var eyeY = (leftPitch * leftLid + rightPitch * rightLid) / (leftLid + rightLid);
 
@@ -99,13 +101,9 @@ private bool ProcessExpressions(ref float[] arKitExpressions)
         convertedExpressions[0] = rightEyeYawCorrected; // left pitch
         convertedExpressions[1] = eyeY;                   // left yaw
         convertedExpressions[2] = rightLid;               // left lid
-        convertedExpressions[3] = arKitExpressions[3];
-        convertedExpressions[4] = arKitExpressions[4];
-        convertedExpressions[5] = leftEyeYawCorrected;  // right pitch
-        convertedExpressions[6] = eyeY;                   // right yaw
-        convertedExpressions[7] = leftLid;                // right lid
-        convertedExpressions[8] = arKitExpressions[8];
-        convertedExpressions[9] = arKitExpressions[9];
+        convertedExpressions[3] = leftEyeYawCorrected;  // right pitch
+        convertedExpressions[4] = eyeY;                   // right yaw
+        convertedExpressions[5] = leftLid;                // right lid
 
         arKitExpressions = convertedExpressions;
 
diff --git a/src/Baballonia/Services/Inference/ImageCollector.cs b/src/Baballonia/Services/Inference/ImageCollector.cs
index d54fba8d..d7dc1f5b 100644
--- a/src/Baballonia/Services/Inference/ImageCollector.cs
+++ b/src/Baballonia/Services/Inference/ImageCollector.cs
@@ -30,22 +30,17 @@ public class ImageCollector : IImageTransformer
         // feed the most recent matrix here at the start
         var last4 = ImageQueue.Skip(ImageQueue.Count - 4).Take(4).Reverse().ToArray();
 
-        var leftChannels = new List<Mat>();
-        var rightChannels = new List<Mat>();
+        var channels = new List<Mat>();
         foreach (var m in last4)
         {
             Mat[] splitChannels = Cv2.Split(m);
-            leftChannels.Add(splitChannels[0]);
-            rightChannels.Add(splitChannels[1]);
+            channels.AddRange(splitChannels);
         }
 
         Mat octoMatrix = new Mat();
-        Cv2.Merge(leftChannels.Concat(rightChannels).ToArray(), octoMatrix);
+        Cv2.Merge(channels.ToArray(), octoMatrix);
 
-        foreach (var channel in leftChannels)
-            channel.Dispose();
-
-        foreach (var channel in rightChannels)
+        foreach (var channel in channels)
             channel.Dispose();
 
         return octoMatrix;
diff --git a/src/Baballonia/Services/ParameterSenderService.cs b/src/Baballonia/Services/ParameterSenderService.cs
index b7eec0c2..69f11e4e 100644
--- a/src/Baballonia/Services/ParameterSenderService.cs
+++ b/src/Baballonia/Services/ParameterSenderService.cs
@@ -25,20 +25,20 @@ public class ParameterSenderService : BackgroundService
     private readonly ConcurrentQueue<OscMessage> _sendQueue = new();
 
     // Expression parameter names
-    public readonly Dictionary<string, string> EyeExpressionMap = new()
+    private readonly Dictionary<string, string> _eyeExpressionMap = new()
     {
         { "LeftEyeX", "/LeftEyeX" },
         { "LeftEyeY", "/LeftEyeY" },
         { "LeftEyeLid", "/LeftEyeLid" },
-        { "LeftEyeWiden", "/LeftEyeWiden" },
-        // { "LeftEyeLower", "/LeftEyeLower" },
-        { "LeftEyeBrow", "/LeftEyeBrow" },
+        //{ "LeftEyeWiden", "/LeftEyeWiden" },
+        //{ "LeftEyeLower", "/LeftEyeLower" },
+        //{ "LeftEyeBrow", "/LeftEyeBrow" },
         { "RightEyeX", "/RightEyeX" },
         { "RightEyeY", "/RightEyeY" },
         { "RightEyeLid", "/RightEyeLid" },
-        { "RightEyeWiden", "/RightEyeWiden" },
-        // { "RightEyeLower", "/RightEyeLower" },
-        { "RightEyeBrow", "/RightEyeBrow" },
+        //{ "RightEyeWiden", "/RightEyeWiden" },
+        //{ "RightEyeLower", "/RightEyeLower" },
+        //{ "RightEyeBrow", "/RightEyeBrow" },
     };
 
     public readonly Dictionary<string, string> FaceExpressionMap = new()
@@ -109,7 +109,7 @@ protected override async Task ExecuteAsync(CancellationToken cancellationToken)
     {
         _logger.LogDebug("Starting Parameter Sender Service...");
         _logger.LogDebug("OSC parameter mapping initialized with {EyeCount} eye expressions and {FaceCount} face expressions",
-            EyeExpressionMap.Count, FaceExpressionMap.Count);
+            _eyeExpressionMap.Count, FaceExpressionMap.Count);
 
         while (!cancellationToken.IsCancellationRequested)
         {
@@ -140,10 +140,10 @@ private void ProcessEyeExpressionData(float[] expressions)
         if (expressions is null) return;
         if (expressions.Length == 0) return;
 
-        for (int i = 0; i < Math.Min(expressions.Length, EyeExpressionMap.Count); i++)
+        for (int i = 0; i < Math.Min(expressions.Length, _eyeExpressionMap.Count); i++)
         {
             var weight = expressions[i];
-            var eyeElement = EyeExpressionMap.ElementAt(i);
+            var eyeElement = _eyeExpressionMap.ElementAt(i);
             var settings = _calibrationService.GetExpressionSettings(eyeElement.Key);
 
             var msg = new OscMessage(_prefix + eyeElement.Value,
diff --git a/src/Baballonia/Services/USBService.cs b/src/Baballonia/Services/USBService.cs
new file mode 100644
index 00000000..21a144cd
--- /dev/null
+++ b/src/Baballonia/Services/USBService.cs
@@ -0,0 +1,72 @@
+using System;
+using Baballonia.Contracts;
+using Microsoft.Extensions.Logging;
+using Usb.Events;
+
+namespace Baballonia.Services;
+
+public sealed class UsbService : IUsbService
+{
+    public event Action<string>? OnUsbConnected;
+    public event Action<string>? OnUsbDisconnected;
+
+    private static readonly IUsbEventWatcher UsbEventWatcher = new UsbEventWatcher(
+        startImmediately: true,                 // True - This part is obvious
+        addAlreadyPresentDevicesToList: false,  // False - This part is less obvious.
+                                                // Don't check devices that are already plugged in! This will spam the refresh queue on launch
+        usePnPEntity: false,                    // False - PnP entity is slower, overkill for our use case
+        includeTTY: true);                      // True - Legacy Babble Trackers show up under /dev/ttyACM*
+
+    private readonly TimeSpan _eventThrottleInterval = TimeSpan.FromSeconds(3);
+    private DateTime _lastEventTime = DateTime.MinValue;
+    private readonly ILogger<UsbService> _logger;
+
+    public UsbService(ILogger<UsbService> logger)
+    {
+        _logger = logger;
+        _logger.LogDebug("Creating UsbService...");
+        UsbEventWatcher.UsbDeviceAdded += UsbDeviceAdded;
+        UsbEventWatcher.UsbDeviceRemoved += UsbDeviceRemoved;
+    }
+
+    private void UsbDeviceAdded(object? sender, UsbDevice? device)
+    {
+        // Note: Sometimes, this won't fire when a device is connected
+        if (device == null)
+            return;
+
+        _logger.LogDebug("Usb added: {DeviceDeviceName}", device.DeviceName);
+        RateLimitedAction(device.DeviceName, OnUsbConnected);
+    }
+
+    private void UsbDeviceRemoved(object? sender, UsbDevice? device)
+    {
+        // Note: Sometimes, this will fire twice when a device is disconnected
+        if (device == null)
+            return;
+
+        _logger.LogDebug("Usb removed."); // DeviceName and other properties here are null/empty
+        RateLimitedAction(string.Empty, OnUsbDisconnected);
+    }
+
+    private void RateLimitedAction(string deviceName, Action<string>? action)
+    {
+        var now = DateTime.UtcNow;
+        var timeSinceLastEvent = now - _lastEventTime;
+
+        if (timeSinceLastEvent < _eventThrottleInterval)
+            return;
+
+        _lastEventTime = now;
+        _logger.LogDebug("Firing rate-limited refresh event...");
+        action?.Invoke(deviceName);
+    }
+
+    ~UsbService()
+    {
+        _logger.LogDebug("Destroying UsbService...");
+        UsbEventWatcher.UsbDeviceAdded -= UsbDeviceAdded;
+        UsbEventWatcher.UsbDeviceRemoved -= UsbDeviceRemoved;
+        UsbEventWatcher.Dispose();
+    }
+}
diff --git a/src/Baballonia/Utils/Utils.cs b/src/Baballonia/Utils/Utils.cs
index 56709b9e..6d6ca941 100644
--- a/src/Baballonia/Utils/Utils.cs
+++ b/src/Baballonia/Utils/Utils.cs
@@ -13,7 +13,7 @@ namespace Baballonia;
 
 public static class Utils
 {
-    public const int EyeRawExpressions = 10;
+    public const int EyeRawExpressions = 6;
     public const int FaceRawExpressions = 45;
     public const int FramesForEyeInference = 4;
 
diff --git a/src/Baballonia/ViewModels/SplitViewPane/CalibrationViewModel.cs b/src/Baballonia/ViewModels/SplitViewPane/CalibrationViewModel.cs
index c12a7a78..2d8b2a89 100644
--- a/src/Baballonia/ViewModels/SplitViewPane/CalibrationViewModel.cs
+++ b/src/Baballonia/ViewModels/SplitViewPane/CalibrationViewModel.cs
@@ -43,12 +43,12 @@ public CalibrationViewModel(EyePipelineManager eyePipelineManager)
         [
             new("LeftEyeLid"),
             new("RightEyeLid"),
-            new ("LeftEyeWiden"),
-            new ("LeftEyeLower"),
-            new ("LeftEyeBrow"),
-            new ("RightEyeWiden"),
-            new ("RightEyeLower"),
-            new ("RightEyeBrow"),
+            //new ("LeftEyeWiden"),
+            //new ("LeftEyeLower"),
+            //new ("LeftEyeBrow"),
+            //new ("RightEyeWiden"),
+            //new ("RightEyeLower"),
+            //new ("RightEyeBrow"),
         ];
 
         JawSettings =
@@ -128,15 +128,15 @@ public CalibrationViewModel(EyePipelineManager eyePipelineManager)
             { "LeftEyeX", 0 },
             { "LeftEyeY", 1 },
             { "LeftEyeLid", 2 },
-            { "LeftEyeWiden", 3 },
-            { "LeftEyeLower", 4 },
-            { "LeftEyeBrow", 5 },
-            { "RightEyeX", 6 },
-            { "RightEyeY", 7 },
-            { "RightEyeLid", 8 },
-            { "RightEyeWiden", 9 },
-            { "RightEyeLower", 10 },
-            { "RightEyeBrow", 11 },
+            //{ "LeftEyeWiden", },
+            //{ "LeftEyeLower",  },
+            //{ "LeftEyeBrow", },
+            { "RightEyeX", 3 },
+            { "RightEyeY", 4 },
+            { "RightEyeLid", 5 },
+            //{ "RightEyeWiden", },
+            //{ "RightEyeLower",  },
+            //{ "RightEyeBrow", },
         };
 
         _faceKeyIndexMap = _parameterSenderService.FaceExpressionMap.Keys
diff --git a/src/Baballonia/Views/HomePageView.axaml b/src/Baballonia/Views/HomePageView.axaml
index 9ff20ab2..bcdc54e6 100644
--- a/src/Baballonia/Views/HomePageView.axaml
+++ b/src/Baballonia/Views/HomePageView.axaml
@@ -134,24 +134,24 @@
           </StackPanel>
       </Border>
 
-            <Grid
-                ColumnDefinitions="2*,1*"
-                HorizontalAlignment="Stretch"
-                RowDefinitions="Auto"
-                x:Name="CameraControlsGrid">
-                <Grid ColumnDefinitions="1*,1*" x:Name="EyesGrid">
-                    <!--  Left Eye Panel  -->
-                    <Grid
-                        IsEnabled="{x:Static utils:Utils.IsSupportedDesktopOS}"
-                        IsVisible="{x:Static utils:Utils.IsSupportedDesktopOS}"
-                        RowDefinitions="Auto,Auto,Auto,Auto"
-                        VerticalAlignment="Top">
-                        <TextBlock
-                            FontSize="20"
-                            FontWeight="Medium"
-                            Grid.Row="0"
-                            Margin="0,0,12,12"
-                            Text="{x:Static assets:Resources.Home_Left_Camera_Header}" />
+      <Grid
+          ColumnDefinitions="2*,1*"
+          HorizontalAlignment="Stretch"
+          RowDefinitions="Auto"
+          x:Name="CameraControlsGrid">
+          <Grid ColumnDefinitions="1*,1*" x:Name="EyesGrid">
+              <!--  Left Eye Panel  -->
+              <Grid
+                  IsEnabled="{x:Static utils:Utils.IsSupportedDesktopOS}"
+                  IsVisible="{x:Static utils:Utils.IsSupportedDesktopOS}"
+                  RowDefinitions="Auto,Auto,Auto,Auto"
+                  VerticalAlignment="Top">
+                  <TextBlock
+                      FontSize="20"
+                      FontWeight="Medium"
+                      Grid.Row="0"
+                      Margin="0,0,12,12"
+                      Text="{x:Static assets:Resources.Home_Left_Camera_Header}" />
 
             <!--  Camera address section  -->
             <Border
diff --git a/src/Baballonia/Views/HomePageView.axaml.cs b/src/Baballonia/Views/HomePageView.axaml.cs
index a1f94074..d321f811 100644
--- a/src/Baballonia/Views/HomePageView.axaml.cs
+++ b/src/Baballonia/Views/HomePageView.axaml.cs
@@ -6,11 +6,14 @@
 using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using Avalonia.VisualTree;
 using Baballonia.Assets;
 using Baballonia.Contracts;
 using Baballonia.Helpers;
+using Baballonia.Services;
 using Baballonia.ViewModels.SplitViewPane;
+using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Baballonia.Views;
 
@@ -26,6 +29,7 @@ public partial class HomePageView : UserControl
 
     private readonly IDeviceEnumerator _deviceEnumerator;
     private readonly ILocalSettingsService _localSettings;
+    private IUsbService _usbService;
 
     public HomePageView(IDeviceEnumerator deviceEnumerator, ILocalSettingsService localSettings)
     {
@@ -116,6 +120,17 @@ public HomePageView(IDeviceEnumerator deviceEnumerator, ILocalSettingsService lo
 
             vm.SelectedCalibrationTextBlock = this.Find<TextBlock>("SelectedCalibrationTextBlockColor")!;
             vm.SelectedCalibrationTextBlock.Text = Assets.Resources.Home_Eye_Calibration;
+
+            if (!Utils.IsSupportedDesktopOS) return;
+            _usbService = Ioc.Default.GetService<IUsbService>()!;
+            _usbService.OnUsbConnected += RefreshDevices;
+            _usbService.OnUsbDisconnected += RefreshDevices;
+        };
+        Unloaded += (_, _) =>
+        {
+            if (_usbService == null) return;
+            _usbService!.OnUsbConnected -= RefreshDevices;
+            _usbService!.OnUsbDisconnected -= RefreshDevices;
         };
     }
 
@@ -199,6 +214,12 @@ private void RefreshConnectedFaceDevices(object? sender, CancelEventArgs e)
         //vm.FaceCamera.UpdateCameraDropDown();
     }
 
+    private async void RefreshDevices(string deviceName)
+    {
+        await Dispatcher.UIThread.InvokeAsync(
+            () => RefreshDevices(null, null!));
+    }
+
     private async void RefreshDevices(object? sender, RoutedEventArgs e)
     {
         if (DataContext is not HomePageViewModel vm) return;
diff --git a/src/Baballonia/eyeModel.onnx b/src/Baballonia/eyeModel.onnx
index de57bd86..0d1c998d 100644
Binary files a/src/Baballonia/eyeModel.onnx and b/src/Baballonia/eyeModel.onnx differ