Index: firmware/App/Controllers/BPModule.c
===================================================================
diff -u -rb4fa063812ba80ecf4f59f6d6c4394aaf22fdb03 -r82e0b3947c200cddb401f2eeb22db4a4711d174d
--- firmware/App/Controllers/BPModule.c	(.../BPModule.c)	(revision b4fa063812ba80ecf4f59f6d6c4394aaf22fdb03)
+++ firmware/App/Controllers/BPModule.c	(.../BPModule.c)	(revision 82e0b3947c200cddb401f2eeb22db4a4711d174d)
@@ -234,7 +234,7 @@
  * The handleBPModuleMeasureState function executes the BP module
  * measurement state
  * @details \b Inputs: none
- * @details \b Outputs: bpModuleState
+ * @details \b Outputs: none
  * @return next BP module state
  ***************************************************************************/
 static BP_MODULE_STATE_T handleBPModuleMeasureState( void )
@@ -258,8 +258,8 @@
 * @brief
 * The handleBPModuleCheckState function executes the BP module
 * validation state handling.
-* @details \b Inputs: checkBloodPressureReading
-* @details \b Outputs: publishVitalsData
+* @details \b Inputs: none
+* @details \b Outputs: none
 * @return next BP module state.
 ***************************************************************************/
 static BP_MODULE_STATE_T handleBPModuleCheckState( void )
@@ -280,8 +280,8 @@
 * The bpModuleHandleVitalsRequest function handles the UI blood
 * pressure measurement request.
 * @details \b Message \b Sent: MSG_ID_TD_BLOOD_PRESSURE_READING
-* @details \b Inputs: isBPCuffConnected
-* @details \b Outputs: requestAdultBPReading
+* @details \b Inputs: none
+* @details \b Outputs: none
 * @return TRUE if request is accepted, FALSE if rejected.
 *************************************************************************/
 BOOL bpModuleHandleVitalsRequest( MESSAGE_T *message )
Index: firmware/App/Drivers/BPDriver.c
===================================================================
diff -u -r3800374f3f5172afec5e9fa96acc6ee4a234e170 -r82e0b3947c200cddb401f2eeb22db4a4711d174d
--- firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision 3800374f3f5172afec5e9fa96acc6ee4a234e170)
+++ firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision 82e0b3947c200cddb401f2eeb22db4a4711d174d)
@@ -261,31 +261,15 @@
 
     if ( 0 != ( getNIBPControlStatus() & BP_FPGA_CMD_GIVEN_MASK ) )
     {
-        nextState = BP_DRIVER_CLEAR_CMD_AFTER_ACK_STATE;
+        setNIBPCommand( (U08)BP_CMD_IDLE );
+        nextState = BP_DRIVER_WAIT_MODULE_START_STATE;
     }
 
     return nextState;
 }
 
 /*********************************************************************//**
 * @brief
-* The handleBPDriverClearCmdAfterAckState function clears the BP command
-* ready bit after FPGA acknowledge.
-* @details \b Inputs: none
-* @details \b Outputs: none
-* @return next BP driver state
-***************************************************************************/
-static BP_DRIVER_STATE_T handleBPDriverClearCmdAfterAckState( void )
-{
-    BP_DRIVER_STATE_T nextState = BP_DRIVER_WAIT_MODULE_START_STATE;
-
-    setNIBPCommand( (U08)BP_CMD_IDLE );
-
-    return nextState;
-}
-
-/*********************************************************************//**
-* @brief
 * The handleBPDriverWaitModuleStartState function waits for the BP module
 * to signal that the command started.
 * @details \b Inputs: pendingBPCommand
@@ -298,7 +282,8 @@
 
     if ( 0 != ( getNIBPStatusResponse() & BP_MODULE_CMD_STARTED_MASK ) )
     {
-        if ( ( (U08)BP_CMD_START_BP == pendingBPCommand ) || ( (U08)BP_CMD_START_PEDS_BP == pendingBPCommand ) )
+        if ( ( (U08)BP_CMD_START_BP == pendingBPCommand ) ||
+             ( (U08)BP_CMD_START_PEDS_BP == pendingBPCommand ) )
         {
             nextState = BP_DRIVER_WAIT_MEASUREMENT_COMPLETE_STATE;
         }
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r12fa9b72d8e338b624879c284488a04b17115762 -r82e0b3947c200cddb401f2eeb22db4a4711d174d
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 12fa9b72d8e338b624879c284488a04b17115762)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 82e0b3947c200cddb401f2eeb22db4a4711d174d)
@@ -504,8 +504,6 @@
 
     // Manage air trap control
     execAirTrapMonitorTreatment();
-    // Execute Blood pressure module
-    execBPModule();
 
     // Call fluid bolus
     execFluidBolus();
Index: firmware/App/Services/FpgaTD.c
===================================================================
diff -u -r12fa9b72d8e338b624879c284488a04b17115762 -r82e0b3947c200cddb401f2eeb22db4a4711d174d
--- firmware/App/Services/FpgaTD.c	(.../FpgaTD.c)	(revision 12fa9b72d8e338b624879c284488a04b17115762)
+++ firmware/App/Services/FpgaTD.c	(.../FpgaTD.c)	(revision 82e0b3947c200cddb401f2eeb22db4a4711d174d)
@@ -1580,7 +1580,7 @@
 * The setNIBPCommand function sets the FPGA NIBP command bits and pulses
 * the command ready bit to notify the FPGA that a new NIBP command is
 * available.
-* @details \b Inputs: command
+* @details \b Inputs: none
 * @details \b Outputs: fpgaActuatorSetPoints.nibpCtl
 * @return none
 *************************************************************************/
@@ -1602,8 +1602,8 @@
 * @brief
 * The setNIBPInflatePressure function sets the initial NIBP cuff inflate
 * pressure register.
-* @details \b Inputs: pressure
-* @details \b Outputs: fpgaActuatorSetPoints.nibpInflate
+* @details \b Inputs: fpgaActuatorSetPoints.nibpInflate
+* @details \b Outputs: none
 * @return none
 *************************************************************************/
 void setNIBPInflatePressure( U16 pressure )
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r12fa9b72d8e338b624879c284488a04b17115762 -r82e0b3947c200cddb401f2eeb22db4a4711d174d
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 12fa9b72d8e338b624879c284488a04b17115762)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 82e0b3947c200cddb401f2eeb22db4a4711d174d)
@@ -21,8 +21,8 @@
 #include "AirTrap.h"
 #include "AlarmMgmt.h"
 #include "BloodFlow.h"
-#include "Bubbles.h"
 #include "BPModule.h"
+#include "Bubbles.h"
 #include "Buttons.h"
 #include "Compatible.h"
 #include "CpldInterface.h"
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r9c833ef5623ce842267e284d958820ac0dc3a7fc -r82e0b3947c200cddb401f2eeb22db4a4711d174d
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 9c833ef5623ce842267e284d958820ac0dc3a7fc)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 82e0b3947c200cddb401f2eeb22db4a4711d174d)
@@ -130,6 +130,9 @@
 
         // Manage data to be transmitted to other sub-systems
         execSystemCommTx();
+
+        // Montior blood pressure vitals
+        execBPModule();
     }
 
 #ifdef TASK_TIMING_OUTPUT_ENABLED
Index: firmware/source/sys_main.c
===================================================================
diff -u -rc37161ede44498a31daddc9a309a963a0bed4ded -r82e0b3947c200cddb401f2eeb22db4a4711d174d
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision c37161ede44498a31daddc9a309a963a0bed4ded)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 82e0b3947c200cddb401f2eeb22db4a4711d174d)
@@ -208,6 +208,8 @@
     initValves();
     // Initialize modes
     initOperationModes();
+    // Initialize blood pressure vitals
+    initBPModule();
 }
 
 /*************************************************************************