diff --git a/csharp/App/SaliMax/src/SystemConfig/Config.cs b/csharp/App/SaliMax/src/SystemConfig/Config.cs
index 61089d13a..c7bd362cf 100644
--- a/csharp/App/SaliMax/src/SystemConfig/Config.cs
+++ b/csharp/App/SaliMax/src/SystemConfig/Config.cs
@@ -16,6 +16,7 @@ public class Config //TODO: let IE choose from config files (Json) and connect t
 
     public required Double         MinSoc                         { get; set; } 
     public required Boolean        ForceCalibrationCharge         { get; set; } 
+    public required Boolean        DisplayIndividualBatteries     { get; set; } 
     public required Double         PConstant                      { get; set; } 
     public required Double         GridSetPoint                   { get; set; } 
     public required Double         BatterySelfDischargePower      { get; set; } 
@@ -40,6 +41,7 @@ public class Config //TODO: let IE choose from config files (Json) and connect t
     {
         MinSoc                         = 20,
         ForceCalibrationCharge         = false,   
+        DisplayIndividualBatteries     = false,
         PConstant                      = .5,
         GridSetPoint                   = 0,
         BatterySelfDischargePower      = 200,  
@@ -115,7 +117,8 @@ public class Config //TODO: let IE choose from config files (Json) and connect t
     public static Config Default => new()
     {
         MinSoc                               = 20,
-        ForceCalibrationCharge               = false, 
+        ForceCalibrationCharge               = false,
+        DisplayIndividualBatteries           = false,
         PConstant                            = .5,
         GridSetPoint                         = 0,
         BatterySelfDischargePower            = 200,  
diff --git a/csharp/App/SaliMax/src/Topology.cs b/csharp/App/SaliMax/src/Topology.cs
index 58ad19e19..923693bbd 100644
--- a/csharp/App/SaliMax/src/Topology.cs
+++ b/csharp/App/SaliMax/src/Topology.cs
@@ -368,27 +368,22 @@ public static class Topology
         var bat = status.Battery;
         var batteryAvgBox = CreateAveragedBatteryBox(bat);
 
-        return batteryAvgBox; // TODO: individualBatteries hidden atm 
-        
-        
-        #pragma warning disable CS0162
         var batteryBoxes = bat
                           .Devices
                           .Select(CreateBatteryBox)
                           .ToReadOnlyList();
 
-        var individualBatteries = batteryBoxes.Any()
-                                ? TextBlock.AlignLeft(batteryBoxes)
-                                : TextBlock.Empty;
 
-        return TextBlock
-              .AlignCenterVertical
-              (
-                  batteryAvgBox ,
-                  individualBatteries 
-              );
-        
-        #pragma warning enable CS0162
+        var individualWithAvgBox = TextBlock
+                                    .AlignCenterVertical
+                                    (
+                                        batteryAvgBox ,
+                                        batteryBoxes.Any()
+                                            ? TextBlock.AlignLeft(batteryBoxes)
+                                            : TextBlock.Empty 
+                                    );
+
+        return status.Config.DisplayIndividualBatteries ? individualWithAvgBox : batteryAvgBox;
     }
 
     private static TextBlock CreateAveragedBatteryBox(Battery48TlRecords? bat)