Index: firmware/App/Services/TDInterface.c
===================================================================
diff -u -r2475e55c224cbd841d61b76f1618451efe6be1f5 -r267bdf6d1ea38846fba29a271c099c9db8c25cbd
--- firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision 2475e55c224cbd841d61b76f1618451efe6be1f5)
+++ firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision 267bdf6d1ea38846fba29a271c099c9db8c25cbd)
@@ -545,40 +545,36 @@
 
     getOverrideArrayPayloadFromMessage( message, &payload );
 
-    if ( DD_MODE_GEND == getCurrentOperationMode() )
-    {
-        switch ( (TD_TREATMENT_OVERRIDE_INDEX_T)payload.index )
-        {
-            case TD_TREATMENT_OVERRIDE_DIALYSATE_FLOWRATE:
-                result = f32Override( message, &tdDialysateFlowrate );
-                break;
+    switch ( ( TD_TREATMENT_OVERRIDE_INDEX_T )payload.index )
+       {
+           case TD_TREATMENT_OVERRIDE_DIALYSATE_FLOWRATE:
+               result = f32ArrayOverride( message,&tdDialysateFlowrate, payload.index );
+               break;
 
-            case TD_TREATMENT_OVERRIDE_UF_RATE:
-                result = f32Override( message, &tdUFRate );
-                break;
+           case TD_TREATMENT_OVERRIDE_UF_RATE:
+               result = f32ArrayOverride( message,&tdUFRate, payload.index );
+               break;
 
-            case TD_TREATMENT_OVERRIDE_DIALYSATE_TEMP:
-                result = f32Override( message, &tdDialysateTemp );
-                break;
+           case TD_TREATMENT_OVERRIDE_DIALYSATE_TEMP:
+               result = f32ArrayOverride( message, &tdDialysateTemp, payload.index );
+               break;
 
-            case TD_TREATMENT_OVERRIDE_ACID_TYPE:
-                result = u32Override( message,&tdAcidType,TD_ACID_TYPE_MIN,TD_ACID_TYPE_MAX );
-                break;
+           case TD_TREATMENT_OVERRIDE_ACID_TYPE:
+               result = u32ArrayOverride( message,&tdAcidType, payload.index, TD_ACID_TYPE_MIN,TD_ACID_TYPE_MAX );
+               break;
 
-            case TD_TREATMENT_OVERRIDE_BICARB_TYPE:
-                result = u32Override( message,&tdBicarbType,TD_BICARB_TYPE_MIN,TD_BICARB_TYPE_MAX );
-                break;
+           case TD_TREATMENT_OVERRIDE_BICARB_TYPE:
+               result = u32ArrayOverride( message, &tdBicarbType, payload.index, TD_BICARB_TYPE_MIN, TD_BICARB_TYPE_MAX );
+               break;
 
-            default:
-                result = FALSE;
-                break;
-        }
+           default:
+               break;
+       }
 
         if ( TRUE == result )
         {
             setTreatmentParamUpdate();
         }
-    }
 
     return result;
 }