Index: firmware/App/Modes/ModeTreatment.h
===================================================================
diff -u -r395522dffef1348e176564925656012f529c1910 -rf0ea13c1a9908920793be07a946dc366d2ab5019
--- firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision 395522dffef1348e176564925656012f529c1910)
+++ firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision f0ea13c1a9908920793be07a946dc366d2ab5019)
@@ -94,26 +94,29 @@
 
 // ********** public function prototypes **********
 
-void initTreatmentMode( void );                                     // Initialize this unit
-U32  transitionToTreatmentMode( void );                             // Prepares for transition to treatment mode
-U32  execTreatmentMode( void );                                     // Execute the treatment mode state machine (call from OperationModes)
+void initTreatmentMode( void );                                      // Initialize this unit
+U32  transitionToTreatmentMode( void );                              // Prepares for transition to treatment mode
+U32  execTreatmentMode( void );                                      // Execute the treatment mode state machine (call from OperationModes)
 
-void signalAlarmActionToTreatmentMode( ALARM_ACTION_T action );     // Execute alarm action as appropriate for treatment mode
-void signalEndTreatment( void );                                    // Requesting transition to post-treatment mode
-void signalBloodPrimeToDialysis( void );                            // Blood prime sub-mode is signaling to move on to dialysis sub-mode
+void signalAlarmActionToTreatmentMode( ALARM_ACTION_T action );      // Execute alarm action as appropriate for treatment mode
+void signalEndTreatment( void );                                     // Requesting transition to post-treatment mode
+void signalBloodPrimeToDialysis( void );                             // Blood prime sub-mode is signaling to move on to dialysis sub-mode
+BOOL validateAndSetTreatmentDuration( MESSAGE_T *message );          // Validate duration request and compute UF rate
+BOOL signalUserConfirmationOfTreatmentDuration( MESSAGE_T *message );// Apply confirmed duration and update runtime settings
+BOOL validateAndSetBolusVolume( MESSAGE_T *message );                // Validate bolus volume request and update parameter
 
-void broadcastTreatmentTimeAndState( void );                        // Broadcast the times and states of this treatment
+void broadcastTreatmentTimeAndState( void );                         // Broadcast the times and states of this treatment
 
-TREATMENT_STATE_T getTreatmentState( void );                        // Determine the current treatment sub-mode (state)
-BOOL isTreatmentCompleted( void );                                  // Determine whether the treatment has completed
-BOOL isTreatmentResumeBlocked( void );                              // Determine whether the treatment is not allowed to be resumed.
-U32  getTreatmentTimeRemainingSecs( void );                         // Determine number of seconds remaining in the treatment
-U32  getActualTreatmentTimeSecs( void );                            // Determine the actual treatment duration in seconds
-void setBloodIsPrimed( BOOL flag );                                 // Set whether the blood-side circuit of the dialyzer has been primed with blood (F causes Tx start/resume to do blood prime first)
-BOOL getBloodIsPrimed( void );                                      // Determine whether the blood-side circuit of the dialyzer has been primed with blood
+TREATMENT_STATE_T getTreatmentState( void );                         // Determine the current treatment sub-mode (state)
+BOOL isTreatmentCompleted( void );                                   // Determine whether the treatment has completed
+BOOL isTreatmentResumeBlocked( void );                               // Determine whether the treatment is not allowed to be resumed.
+U32  getTreatmentTimeRemainingSecs( void );                          // Determine number of seconds remaining in the treatment
+U32  getActualTreatmentTimeSecs( void );                             // Determine the actual treatment duration in seconds
+void setBloodIsPrimed( BOOL flag );                                  // Set whether the blood-side circuit of the dialyzer has been primed with blood (F causes Tx start/resume to do blood prime first)
+BOOL getBloodIsPrimed( void );                                       // Determine whether the blood-side circuit of the dialyzer has been primed with blood
 
-U32  getTreatmentStartTimeStamp( void );                            // Get the treatment start time stamp
-U32  getTreatmentEndTimeStamp( void );                              // Get the treatment end time stamp
+U32  getTreatmentStartTimeStamp( void );                             // Get the treatment start time stamp
+U32  getTreatmentEndTimeStamp( void );                               // Get the treatment end time stamp
 
 /**@}*/