Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -r9bb9f9bb8b96f057b2ad8dd42c5ac4f0861c1d90 -rdb79d769d50c69861f68b4e4aec146d807a641f2
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 9bb9f9bb8b96f057b2ad8dd42c5ac4f0861c1d90)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision db79d769d50c69861f68b4e4aec146d807a641f2)
@@ -410,6 +410,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 )
@@ -433,11 +436,6 @@
         rejReason = REQUEST_REJECT_REASON_UF_VOLUME_OUT_OF_RANGE;
     }
 
-    // store the user set ultrafiltration volume in pre-treatment parameters setup, if it is validated
-    if ( TRUE == accepted ) {
-        setUltrafiltrationVolumeOriginal( uFVolumeL );
-    }
-
     // Respond to set treatment parameters request message
     uFVolumeL = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );
     uFVolumeMl = uFVolumeL * (F32)ML_PER_LITER;
@@ -839,30 +837,15 @@
 
 /*********************************************************************//**
  * @brief
- * The setUltrafiltrationVolumeOriginal function stores the floating point value
- * of the original set treatment parameter's ultrafiltration volume by user in
- * Pre-Treatment mode.
- * @details Inputs: F32
- * @details Outputs: none
- * @param volume_L the original ultrafiltration volume value in liter.
- * @return none
- *************************************************************************/
-void setUltrafiltrationVolumeOriginal(F32 volume_L)
-{
-    origTreatmentParams.uFVolume_L = volume_L;
-}
-
-/*********************************************************************//**
- * @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: F32
+ * @details Outputs: origTreatmentParams.uFVolume_L
  * @param none
  * @return the original ultrafiltration volume value in liter
  *************************************************************************/
-F32 getUltrafiltrationVolumeOriginal()
+F32 getUltrafiltrationVolumeOriginal( void )
 {
     return origTreatmentParams.uFVolume_L;
 }
@@ -872,12 +855,12 @@
  * 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: none
- * @details Outputs: F32
+ * @details Inputs: origTreatmentParams.uFVolume_L, origTreatmentParams.treatmentDuration_min
+ * @details Outputs: none
  * @param none
  * @return the original ultrafiltration rate value in mL/min
  *************************************************************************/
-F32 getUltrafiltrationRateOriginal()
+F32 getUltrafiltrationRateOriginal( void )
 {
     return origTreatmentParams.uFVolume_L * ML_PER_LITER / origTreatmentParams.treatmentDuration_min;
 }
Index: firmware/App/Modes/ModeTreatmentParams.h
===================================================================
diff -u -r9bb9f9bb8b96f057b2ad8dd42c5ac4f0861c1d90 -rdb79d769d50c69861f68b4e4aec146d807a641f2
--- firmware/App/Modes/ModeTreatmentParams.h	(.../ModeTreatmentParams.h)	(revision 9bb9f9bb8b96f057b2ad8dd42c5ac4f0861c1d90)
+++ firmware/App/Modes/ModeTreatmentParams.h	(.../ModeTreatmentParams.h)	(revision db79d769d50c69861f68b4e4aec146d807a641f2)
@@ -92,11 +92,9 @@
 S32 getTreatmentParameterS32( TREATMENT_PARAM_T param );                            // Get a specified signed integer treatment parameter
 F32 getTreatmentParameterF32( TREATMENT_PARAM_T param );                            // Get a specified floating point treatment parameter
 BOOL isTreatmentParamInRange( TREATMENT_PARAM_T param, CRITICAL_DATAS_T value );    // Check range for a proposed treatment parameter value
-void setUltrafiltrationVolumeOriginal(F32 volume_L);                                // Set the original ultrafiltration volume, set in pre-treatment mode by user.
-F32 getUltrafiltrationVolumeOriginal();                                             // Get the original ultrafiltration volume, set in pre-treatment mode by user.
-F32 getUltrafiltrationRateOriginal();                                               // Get/calculate the original ultrafiltration rate, by ultrafiltration volume and treatment duration set in pre-treatment mode by user.
+F32 getUltrafiltrationVolumeOriginal( void );                                             // Get the original ultrafiltration volume, set in pre-treatment mode by user.
+F32 getUltrafiltrationRateOriginal( void );                                               // Get/calculate the original ultrafiltration rate, by ultrafiltration volume and treatment duration set in pre-treatment mode by user.
 
-
 BOOL testSetTreatmentParameter( TREATMENT_PARAM_T param, CRITICAL_DATAS_T value );  // Set a specific treatment parameter value
 
 /**@}*/