Index: firmware/App/Modes/BloodPrime.c
===================================================================
diff -u -r1942c708bc95f57e87b0bf6a472ebe824a3f38ed -r9c3f5379ed2fbf1053bb7c446a0a1302f66459b4
--- firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision 1942c708bc95f57e87b0bf6a472ebe824a3f38ed)
+++ firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision 9c3f5379ed2fbf1053bb7c446a0a1302f66459b4)
@@ -251,7 +251,7 @@
  * @details Outputs: none
  * @return bloodPrimeState
  *************************************************************************/
-TREATMENT_END_STATE_T getCurrentBloodPrimeState( void )
+BLOOD_PRIME_STATE_T getCurrentBloodPrimeState( void )
 {
     return bloodPrimeState;
 }
Index: firmware/App/Modes/BloodPrime.h
===================================================================
diff -u -r1942c708bc95f57e87b0bf6a472ebe824a3f38ed -r9c3f5379ed2fbf1053bb7c446a0a1302f66459b4
--- firmware/App/Modes/BloodPrime.h	(.../BloodPrime.h)	(revision 1942c708bc95f57e87b0bf6a472ebe824a3f38ed)
+++ firmware/App/Modes/BloodPrime.h	(.../BloodPrime.h)	(revision 9c3f5379ed2fbf1053bb7c446a0a1302f66459b4)
@@ -53,7 +53,7 @@
 void transitionToBloodPrime( void );
 void execBloodPrime( void );
 
-TREATMENT_END_STATE_T getCurrentBloodPrimeState( void );
+BLOOD_PRIME_STATE_T getCurrentBloodPrimeState( void );
 
 /**@}*/
 
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r1942c708bc95f57e87b0bf6a472ebe824a3f38ed -r9c3f5379ed2fbf1053bb7c446a0a1302f66459b4
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 1942c708bc95f57e87b0bf6a472ebe824a3f38ed)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 9c3f5379ed2fbf1053bb7c446a0a1302f66459b4)
@@ -1135,14 +1135,17 @@
         DIALYSIS_STATE_T dialysisState = getDialysisState();
         UF_STATE_T uFState = getUltrafiltrationState();
         SALINE_BOLUS_STATE_T salineBolusInProgress = getSalineBolusState();
+        BLOOD_PRIME_STATE_T bldPrimeState = getCurrentBloodPrimeState();
         RINSEBACK_STATE_T rBState = getCurrentRinsebackState();
         TREATMENT_RECIRC_STATE_T rCState = getCurrentTreatmentRecircState();
+        TREATMENT_END_STATE_T endState = getCurrentTreatmentEndState();
+
         HEPARIN_STATE_T hepState = HEPARIN_STATE_OFF;  // TODO - get Heparin state when implemented
 
 
         broadcastTreatmentTime( presTreatmentTimeSecs, elapsedTreatmentTimeInSecs, timeRemaining );
         broadcastTreatmentState( (U32)currentTreatmentState, (U32)uFState, (U32)salineBolusInProgress,
-                                 (U32)hepState, (U32)rBState, (U32)rCState );
+                                 (U32)hepState, (U32)rBState, (U32)rCState, (U32)bldPrimeState, (U32)endState );
         treatmentTimeBroadcastTimerCtr = 0;
     }
 }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r1942c708bc95f57e87b0bf6a472ebe824a3f38ed -r9c3f5379ed2fbf1053bb7c446a0a1302f66459b4
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1942c708bc95f57e87b0bf6a472ebe824a3f38ed)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9c3f5379ed2fbf1053bb7c446a0a1302f66459b4)
@@ -1047,10 +1047,12 @@
  * @param salineBolusState 1=saline bolus in progress, 0=not, 2=max bolus volume reached
  * @param hepState Current state of Heparin controller
  * @param rinsebackState Current state of rinseback sub-mode
- * @param txRecircState Current state of treatment re-circulate sub-mode
+ * @param txRecircState Current state of treatment re-circulate sub-mode
+ * @param bldPrimeState Current state of blood prime sub-mode
+ * @param txEndState Current state of treatment end sub-mode
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastTreatmentState( U32 subMode, U32 uFState, U32 salineBolusState, U32 hepState, U32 rinsebackState, U32 txRecircState )
+BOOL broadcastTreatmentState( U32 subMode, U32 uFState, U32 salineBolusState, U32 hepState, U32 rinsebackState, U32 txRecircState, U32 bldPrimeState, U32 txEndState )
 {
     BOOL result;
     MESSAGE_T msg;
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r1942c708bc95f57e87b0bf6a472ebe824a3f38ed -r9c3f5379ed2fbf1053bb7c446a0a1302f66459b4
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1942c708bc95f57e87b0bf6a472ebe824a3f38ed)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 9c3f5379ed2fbf1053bb7c446a0a1302f66459b4)
@@ -234,7 +234,7 @@
 BOOL broadcastTreatmentTime( U32 secsTotTreatment, U32 secsElapsed, U32 secsRemaining );
 
 // MSG_ID_TREATMENT_STATE
-BOOL broadcastTreatmentState( U32 subMode, U32 uFState, U32 salineBolusState, U32 hepState, U32 rinsebackState, U32 txRecircState );
+BOOL broadcastTreatmentState( U32 subMode, U32 uFState, U32 salineBolusState, U32 hepState, U32 rinsebackState, U32 txRecircState, U32 bldPrimeState, U32 txEndState );
 
 // MSG_ID_POWER_OFF_WARNING
 BOOL broadcastPowerOffWarning( void );