Index: branches/fscctrl_safety_limits/src/HeadersFSC.h
===================================================================
--- branches/fscctrl_safety_limits/src/HeadersFSC.h	(revision 18342)
+++ branches/fscctrl_safety_limits/src/HeadersFSC.h	(revision 18343)
@@ -48,18 +48,4 @@
         uint16_t time_ms;
     } __attribute__((__packed__));
-
-
-    //struct SecurityCurrentLimits
-    //{
-    //    double ethernet_switch;
-    //    double FFC;
-    //    double FLP;
-    //    double FAD_digital;
-    //    double FAD_negative;
-    //    double FAD_positive;
-    //    double FPA_digital;
-    //    double FPA_negative;
-    //    double FPA_positive;
-    //};
 }
 
Index: branches/fscctrl_safety_limits/src/fscctrl.cc
===================================================================
--- branches/fscctrl_safety_limits/src/fscctrl.cc	(revision 18342)
+++ branches/fscctrl_safety_limits/src/fscctrl.cc	(revision 18343)
@@ -617,6 +617,4 @@
         
         Out() << ". - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . - . -." << endl;
-        
-
     }
 
@@ -705,6 +703,4 @@
     }
 
-
-
     void StartRead()
     {
@@ -1226,13 +1222,13 @@
     po::options_description current_limits("Security current limits");
     current_limits.add_options()
-        ("ethernet_switch", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
-        ("FFC", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
-        ("FLP", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
-        ("FAD_digital", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
-        ("FAD_negative", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
-        ("FAD_positive", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
-        ("FPA_digital", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
-        ("FPA_negative", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
-        ("FPA_positive", var<double>()->required(), "(signed) floating point number, the max/min current, for pos/neg currents in A.")
+        ("max-current.ethernet-switch", var<double>(INFINITY), "Maximum current for the Ethernet Switch [A]")
+        ("max-current.FFC", var<double>(INFINITY), "Maximum current for the FFC [A]")
+        ("max-current.FLP", var<double>(INFINITY), "Maximum current for the FLP [A]")
+        ("max-current.FAD-digital", var<double>(INFINITY), "Maximum current for the FAD digital [A]")
+        ("max-current.FAD-negative", var<double>(INFINITY), "Maximum current for the FAD negative [A]")
+        ("max-current.FAD-positive", var<double>(INFINITY), "Maximum current for the FAD positive [A]")
+        ("max-current.FPA-digital", var<double>(INFINITY), "Maximum current for the FPA digital [A]")
+        ("max-current.FPA-negative", var<double>(INFINITY), "Maximum current for the FPA negative [A]")
+        ("max-current.FPA-positive", var<double>(INFINITY), "Maximum current for the FPA positive [A]")
         ;