Index: firmware/App/Modes/ModeTreatment.h
===================================================================
diff -u -r909d4064e98d5684ee139534f0ac6cbc5f8774d5 -rb56dffdfe60950630de83b03eb8527a1e10e1f63
--- firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision 909d4064e98d5684ee139534f0ac6cbc5f8774d5)
+++ firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision b56dffdfe60950630de83b03eb8527a1e10e1f63)
@@ -98,9 +98,9 @@
 #pragma pack(pop)
 
 /// Maximum time in this mode before blood sitting alarm given (in general task intervals).
-#define MAX_TIME_BLOOD_SITTING      ( ( 5 * SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )     // Replace with Maximum Blood Pump Allowable Stop Time institutional setting when implemented
+#define MAX_TIME_BLOOD_SITTING      ( ( 5 * SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )     //TODO: Replace with Maximum Blood Pump Allowable Stop Time institutional setting when implemented
 /// Maximum time in this mode before blood sitting warning given (in general task intervals).
-#define WARN_TIME_BLOOD_SITTING     ( ( 4 * SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )     // Replace with Maximum Blood Pump Allowable Stop Time institutional setting when implemented
+#define WARN_TIME_BLOOD_SITTING     ( ( 4 * SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )     //TODO: Replace with Maximum Blood Pump Allowable Stop Time institutional setting when implemented
 
 // ********** public function prototypes **********
 
Index: firmware/App/Modes/StateTxRinseback.c
===================================================================
diff -u -r909d4064e98d5684ee139534f0ac6cbc5f8774d5 -rb56dffdfe60950630de83b03eb8527a1e10e1f63
--- firmware/App/Modes/StateTxRinseback.c	(.../StateTxRinseback.c)	(revision 909d4064e98d5684ee139534f0ac6cbc5f8774d5)
+++ firmware/App/Modes/StateTxRinseback.c	(.../StateTxRinseback.c)	(revision b56dffdfe60950630de83b03eb8527a1e10e1f63)
@@ -96,7 +96,7 @@
 static BOOL handleRecircUserAction( REQUEST_REJECT_REASON_CODE_T *rejReason );
 
 static void publishRinsebackData( void );
-static void handleRinsebackBloodSittingTimer( void );
+static void handleRinsebackBloodSittingAlarms( void );
 static U32 getPublishRinsebackInterval( void );
 
 /*********************************************************************//**
@@ -251,13 +251,13 @@
 
 /*********************************************************************//**
  * @brief
- * The handleRinsebackBloodSittingTimer function handles the no re-circ
- * blood timer.
- * @details Inputs: bloodSittingTimerCtr
- * @details Outputs: none
+ * The handleRinsebackBloodSittingAlarms function handles blood sitting alarms
+ * (when blood pump is not running).
+ * @details \b Inputs: bloodSittingTimerCtr
+ * @details \b Outputs: none
  * @return none
  *************************************************************************/
-static void handleRinsebackBloodSittingTimer( void )
+static void handleRinsebackBloodSittingAlarms( void )
 {
     if ( bloodSittingTimerCtr > WARN_TIME_BLOOD_SITTING )
     {
@@ -319,11 +319,11 @@
     // Rinseback flags should be handled by now - reset in case not handled by current state
     resetRinsebackFlags();
 
+    // Call blood sitting timer counter
+    handleRinsebackBloodSittingAlarms();
+
     // Publish rinseback progress while in rinseback sub-mode
     publishRinsebackData();
-
-    // Call blood sitting timer counter
-    handleRinsebackBloodSittingTimer();
 }
 
 /*********************************************************************//**