Index: firmware/App/Drivers/PeristalticPump.c
===================================================================
diff -u -r484dd53d787c984b0f6103c934344d3b7bcc647f -r4a65377085c075e15056b4157e17e7ed0ec15301
--- firmware/App/Drivers/PeristalticPump.c	(.../PeristalticPump.c)	(revision 484dd53d787c984b0f6103c934344d3b7bcc647f)
+++ firmware/App/Drivers/PeristalticPump.c	(.../PeristalticPump.c)	(revision 4a65377085c075e15056b4157e17e7ed0ec15301)
@@ -122,8 +122,8 @@
     // monitor home command status if in progress, stop pump if rotor is in home position
     if ( ( TRUE == pumpHomeInProgress ) && ( TRUE == isPeristalticPumpHome() ) )
     {
-        pumpHomeInProgress = FALSE;
         setPeristalticPumpSetSpeed( 0 );
+        pumpHomeInProgress = FALSE;
     }
 }
 
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r2d40deb50ffb27667c3e57f427b1e197e163910e -r4a65377085c075e15056b4157e17e7ed0ec15301
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 2d40deb50ffb27667c3e57f427b1e197e163910e)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 4a65377085c075e15056b4157e17e7ed0ec15301)
@@ -818,7 +818,7 @@
         spPayload.bloodFlow = getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW );
         spPayload.dialFlow  = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW );
         spPayload.dialTemp  = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
-        sendMessage( MSG_ID_TD_TREATMENT_SET_POINTS, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)(&payload), sizeof( TREATMENT_SET_POINTS_T ) );
+        sendMessage( MSG_ID_TD_TREATMENT_SET_POINTS, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)(&spPayload), sizeof( TREATMENT_SET_POINTS_T ) );
     }
 
     // Broadcast treatment state data at interval
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r101c03d165ec613ba384bdad53100ba7bdda1e2c -r4a65377085c075e15056b4157e17e7ed0ec15301
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 101c03d165ec613ba384bdad53100ba7bdda1e2c)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 4a65377085c075e15056b4157e17e7ed0ec15301)
@@ -158,10 +158,25 @@
     {
         static BOOL homeValveCmd = FALSE;
         static BOOL setValvePos = FALSE;
+        static BOOL homeBPCmd = FALSE;
+        static BOOL bpHomed = FALSE;
         static VALVE_POSITION_T setPos = VALVE_POSITION_A_INSERT_EJECT;  // VALVE_POSITION_B_OPEN VALVE_POSITION_C_CLOSE VALVE_POSITION_A_INSERT_EJECT
 
         execValvesController();
+        execBloodFlowMonitor();
+        execBloodFlowController();
 
+        bpHomed = isPeristalticPumpHome();
+        if ( TRUE == bpHomed )
+        {
+            bpHomed = FALSE;
+        }
+        if ( TRUE == homeBPCmd )
+        {
+            homeBloodPump();
+            homeBPCmd = FALSE;
+        }
+
         if ( TRUE == homeValveCmd )
         {
             homeValve( H1_VALV, FALSE, FALSE );