Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r98f34c2ab63d51a1bf248db454ebc04e184d4748 -r2cc4f0cfc6512c942864d7d302cef5df375a2081
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 98f34c2ab63d51a1bf248db454ebc04e184d4748)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2cc4f0cfc6512c942864d7d302cef5df375a2081)
@@ -1187,10 +1187,6 @@
             handleUIUserConfirmTreatmentParameters( message );
             break;
 
-        case MSG_ID_UI_TREATMENT_END_REQUEST:
-            handleUIUserEndTreatmentRequest( message );
-            break;
-
         case MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST:
             handleChangePressureLimitsRequest( message );
             break;
@@ -1199,6 +1195,18 @@
             handleUFVolumeSetRequest( message );
             break;
 
+        case MSG_ID_UI_RINSEBACK_CMD:
+            handlRinsebackCmd( message );
+            break;
+
+        case MSG_ID_UI_RECIRC_CMD:
+            handleTreatmentRecircCmd( message );
+            break;
+
+        case MSG_ID_UI_TX_END_CMD:
+            handleTreatmentEndCmd( message );
+            break;
+
         case MSG_ID_DG_COMMAND_RESPONSE:
             handleDGCmdResp( message );
             break;
@@ -1259,6 +1267,10 @@
 
             case MSG_ID_BLOOD_FLOW_SEND_INTERVAL_OVERRIDE:
                 handleTestBloodFlowBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_TREATMENT_TIME_REMAINING_OVERRIDE:
+                handleTestTreatmentTimeRemainingOverrideRequest( message );
                 break;
 
             case MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE:
@@ -1373,18 +1385,6 @@
                 handleTestHDAccelBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_ACCEL_SET_CALIBRATION:
-                handleSetAccelCalibration( message );
-                break;
-
-            case MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION:
-                handleSetBloodFlowCalibration( message );
-                break;
-
-            case MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION:
-                handleSetDialysateFlowCalibration( message );
-                break;
-
             case MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE:
                 handleTestDialOutFlowSetPointOverrideRequest( message );
                 break;
@@ -1447,16 +1447,19 @@
                 handleTestDialOutPumpHomeRequest( message );
                 break;
 
-            case MSG_ID_SUPER_CLEAR_ALARMS_CMD:
-                handleTestSuperClearAlarmsRequest( message );
+            case MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE:
+                handleSetFluidLeakBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_REQUEST_CALIBRATION_DATA:
-                handleTestHDCalibrationDataRequest( message );
+            case MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE:
+                handleSetFluidLeakStateDetectorOverrideRequest( message );
+
+            case MSG_ID_HD_SET_OP_MODE_REQUEST:
+                handleTestSetOpModeRequest( message );
                 break;
 
-            case MSG_ID_HD_ERASE_CALIBRATION_DATA:
-                handleTestEraseHDCalibrationDataRequest( message );
+            case MSG_ID_SUPER_CLEAR_ALARMS_CMD:
+                handleTestSuperClearAlarmsRequest( message );
                 break;
 
             default: