Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -r9a45dcbdfae33fc06479d99b8d52bada8f682194 -re0af40e2557c9f9c4fd9f97e909b3cccdc2d15fe
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 9a45dcbdfae33fc06479d99b8d52bada8f682194)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision e0af40e2557c9f9c4fd9f97e909b3cccdc2d15fe)
@@ -62,6 +62,7 @@
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=2},    {.uInt=0}    }, // TREATMENT_PARAM_ACID_CONCENTRATE
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=0},    {.uInt=0}    }, // TREATMENT_PARAM_BICARB_CONCENTRATE
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=4},    {.uInt=0}    }, // TREATMENT_PARAM_DIALYZER_TYPE
+    { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=0},    {.uInt=0}    }, // TREATMENT_PARAM_HEPARIN_TYPE
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=60},   {.uInt=30}   }, // TREATMENT_PARAM_BP_MEAS_INTERVAL
     { CRITICAL_DATA_TYPE_U32, {.uInt=50},   {.uInt=150},  {.uInt=75}   }, // TREATMENT_PARAM_RINSEBACK_FLOW_RATE
     { CRITICAL_DATA_TYPE_S32, {.sInt=-300}, {.sInt=-30},  {.sInt=-300} }, // TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT
@@ -415,6 +416,9 @@
 
     if ( TRUE == accepted )
     {
+        // store the user set ultrafiltration volume in pre-treatment parameters setup, if it is validated, otherwise keep the initial 0.0
+        origTreatmentParams.uFVolume_L = uFVolumeL;
+
         U32 treatmentDuration = getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION );
 
         if ( treatmentDuration > 0 )
@@ -837,7 +841,36 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getUltrafiltrationVolumeOriginal function gets the floating point value
+ * of the original set treatment parameter's ultrafiltration volume by user in
+ * Pre-Treatment mode.
+ * @details Inputs: none
+ * @details Outputs: origTreatmentParams.uFVolume_L
+ * @param none
+ * @return the original ultrafiltration volume value in liter
+ *************************************************************************/
+F32 getUltrafiltrationVolumeOriginal( void )
+{
+    return origTreatmentParams.uFVolume_L;
+}
 
+/*********************************************************************//**
+ * @brief
+ * The getUltrafiltrationRateOriginal function gets the floating point value
+ * of the original ultrafiltration rate calculated by the set treatment parameter's
+ * ultrafiltration volume and treatment duration by user in Pre-Treatment mode.
+ * @details Inputs: origTreatmentParams.uFVolume_L, origTreatmentParams.treatmentDuration_min
+ * @details Outputs: none
+ * @param none
+ * @return the original ultrafiltration rate value in mL/min
+ *************************************************************************/
+F32 getUltrafiltrationRateOriginal( void )
+{
+    return origTreatmentParams.uFVolume_L * ML_PER_LITER / origTreatmentParams.treatmentDuration_min;
+}
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/