Index: firmware/App/Services/TxParams.h
===================================================================
diff -u -r41a1b7a822a45813af610292a9af90e1a0f83763 -r1e8f1e33b885d6b5d64efa37525fa4ea6720b4d5
--- firmware/App/Services/TxParams.h	(.../TxParams.h)	(revision 41a1b7a822a45813af610292a9af90e1a0f83763)
+++ firmware/App/Services/TxParams.h	(.../TxParams.h)	(revision 1e8f1e33b885d6b5d64efa37525fa4ea6720b4d5)
@@ -96,6 +96,7 @@
 typedef struct
 {
     U32 duration;                                                       ///< Confirmed treatment duration in minutes.
+    U32 heparinDuration;                                                 ///< Confirmed heparin delivery duration in minutes.
     F32 ufRate;                                                         ///< Confirmed UF rate in L/hr.
 } DURATION_CONFIRM_REQUEST_PAYLOAD_T;
 
@@ -105,23 +106,24 @@
     BOOL accepted;                                                      ///< Accepted/Rejected.
     U32 rejectionReason;                                                ///< Rejection reason if not accepted.
     U32 duration;                                                       ///< Treatment duration in minutes.
+    U32 heparinDuration;                                                ///< Heparin delivery duration in minutes.
     F32 ufVolumeGoal;                                                   ///< UF volume goal in L.
     F32 ufRate;                                                         ///< UF rate in L/hr.
 } DURATION_VALIDATE_RESPONSE_PAYLOAD_T;
 
+/// Payload record structure for UI response.
+typedef struct
+{
+    BOOL accepted;              ///< Accepted/Rejected
+    U32 rejectionReason;        ///< Rejection reason if not accepted.
+} UI_RESPONSE_PAYLOAD_T;
+
 /// Payload record structure for bolus volume change request.
 typedef struct
 {
     U32 bolusVolume;                                                    ///< Requested bolus volume (in mL).
 } BOLUS_VOLUME_CHANGE_REQUEST_PAYLOAD_T;
 
-/// Payload record structure for bolus volume change response.
-typedef struct
-{
-    BOOL accepted;                                                      ///< Accepted/Rejected.
-    U32 rejectionReason;                                                ///< Rejection reason if not accepted
-} BOLUS_VOLUME_CHANGE_RESPONSE_PAYLOAD_T;
-
 /// Payload record structure for pressure limit change request.
 typedef struct
 {
@@ -160,7 +162,6 @@
     BOOL accepted;                                                      ///< Accepted/Rejected.
     U32 rejectionReason;                                                ///< Rejection reason if not accepted.
     F32 ufVolumeGoal;                                                   ///< UF Volume in L.
-    U32 duration;                                                       ///< new Treatment duration in minutes.
     F32 ufRate;                                                         ///< new UF rate in L/hr.
 } UF_VOLUME_RESPONSE_PAYLOAD_T;
 
@@ -170,47 +171,26 @@
     U32 flowRate;                                                       ///< Blood flow rate in mL/min.
 } BLOOD_FLOW_RATE_CHANGE_REQUEST_PAYLOAD_T;
 
-/// Payload record structure for blood flow rate change response.
-typedef struct
-{
-    BOOL accepted;                                                      ///< Accepted/Rejected.
-    U32 rejectionReason;                                                ///< Rejection reason if not accepted.
-} BLOOD_FLOW_RATE_CHANGE_RESPONSE_PAYLOAD_T;
-
 /// Payload record structure for dialysate flow rate change request.
 typedef struct
 {
     U32 flowRate;                                                       ///< Dialysate flow rate in mL/min.
 } DIALYSATE_FLOW_RATE_CHANGE_REQUEST_PAYLOAD_T;
 
-/// Payload record structure for dialysate flow rate change response.
-typedef struct
-{
-    BOOL accepted;                                                      ///< Accepted/Rejected.
-    U32 rejectionReason;                                                ///< Rejection reason if not accepted.
-} DIALYSATE_FLOW_RATE_CHANGE_RESPONSE_PAYLOAD_T;
-
 /// Payload record structure for dialysate temperature change request.
 typedef struct
 {
     F32 temperature;                                                    ///< Dialysate temperature in degrees Celsius.
 } DIALYSATE_TEMPERATURE_CHANGE_REQUEST_PAYLOAD_T;
 
-/// Payload record structure for dialysate temperature change response.
-typedef struct
-{
-    BOOL accepted;                                                       ///< Accepted/Rejected.
-    U32 rejectionReason;                                                 ///< Rejection reason if not accepted.
-} DIALYSATE_TEMPERATURE_CHANGE_RESPONSE_PAYLOAD_T;
-
 /// Payload record structure for treatment set points change request.
 typedef struct
 {
     U32 bloodFlowRate;                                                   ///< Blood flow rate.
     U32 dialysateFlowRate;                                               ///< Dialysate flow rate.
     F32 dialysateTemperature;                                            ///< Dialysate temperature.
     U32 acidConcentrate;                                                 ///< Acid concentrate.
-    U32 acidConcentrateConversionFactor;                                 ///< Acid concentrate conversion factor.
+    F32 acidConcentrateConversionFactor;                                 ///< Acid concentrate conversion factor.
     U32 bicarbonateConcentrate;                                          ///< Bicarbonate concentrate.
     U32 treatmentModality;                                               ///< Treatment modality.
     U32 hepatitis;                                                       ///< Hepatitis status.