Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r12cb82342073207c23708afaa64b25f83f2cdfed -r8a0632bf9908008ee8db18474bc914d990760986
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 12cb82342073207c23708afaa64b25f83f2cdfed)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 8a0632bf9908008ee8db18474bc914d990760986)
@@ -15,7 +15,8 @@
 *
 ***************************************************************************/
 
-#include "DialInFlow.h"
+#include "DialInFlow.h"
+#include "ModeInitPOST.h"
 #include "ModeTreatment.h"
 #include "OperationModes.h"
 #include "SystemCommMessages.h"
@@ -37,7 +38,7 @@
 #define SIZE_OF_SMALL_LOAD_CELL_AVG         8                   ///< Small load cell moving average has 8 samples.
 #define SIZE_OF_LARGE_LOAD_CELL_AVG         32                  ///< Large load cell moving average has 32 samples.
 
-#define MAX_LOAD_CELL_CHANGE_G              70.0                ///< Maximum delta between new load cell sample and its small moving average (in g).
+#define MAX_LOAD_CELL_CHANGE_G              1000.0              ///< Maximum delta between new load cell sample and its small moving average (in g).  Can change quite a bit during tare.
 #define MAX_ACTIVE_LOAD_CELL_CHANGE_G       30.0                ///< Maximum delta between new load cell sample and its small moving average (in g) when associated reservoir is active in treatment.
 #define LOAD_CELL_CHANGE_PERSISTENCE        3                   ///< Excessive load cell acceleration must persist for 3 samples (@ 10 Hz) to trigger alarm.
 
@@ -682,7 +683,7 @@
         {
             deltaAlarmDetected = TRUE;
         }
-        else if ( delta > MAX_LOAD_CELL_CHANGE_G )
+        else if ( ( delta > MAX_LOAD_CELL_CHANGE_G ) && ( TRUE == isPOSTCompleted() ) )
         {
             deltaAlarmDetected = TRUE;
         }
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r351ae8d56096982a68f7df1b69a3bf4dd5785094 -r8a0632bf9908008ee8db18474bc914d990760986
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 351ae8d56096982a68f7df1b69a3bf4dd5785094)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 8a0632bf9908008ee8db18474bc914d990760986)
@@ -159,28 +159,6 @@
 
 /*********************************************************************//**
  * @brief
- * The userRequestEndTreatment function conveys a user request to end the
- * treatment.
- * @details Inputs: currentTreatmentState
- * @details Outputs: response to user request sent
- * @return TRUE if request accepted, FALSE if not
- *************************************************************************/
-BOOL userRequestEndTreatment( void )
-{
-    BOOL result = FALSE;
-
-    if ( TREATMENT_STOP_STATE == currentTreatmentState )
-    {
-        pendingUserEndTreatmentRequest = TRUE;
-        result = TRUE;
-    }
-    sendTreatmentEndResponseMsg( result );
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The execTreatmentMode function executes the Treatment Mode state machine.
  * @details Inputs: currentTreatmentState
  * @details Outputs: currentTreatmentState
Index: firmware/App/Modes/ModeTreatment.h
===================================================================
diff -u -r933a18d740285e70be9d00696ed0f5a5381bc8e4 -r8a0632bf9908008ee8db18474bc914d990760986
--- firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision 933a18d740285e70be9d00696ed0f5a5381bc8e4)
+++ firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision 8a0632bf9908008ee8db18474bc914d990760986)
@@ -83,7 +83,6 @@
 
 TREATMENT_STATE_T getTreatmentState( void );
 
-BOOL userRequestEndTreatment( void );
 void broadcastTreatmentTimeAndState( void );
 
 BOOL verifyTreatmentDurationSettingChange( U32 treatmentTime );
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rdaaf76c5b69282cb044896b7722c73ac7c89f1a1 -r8a0632bf9908008ee8db18474bc914d990760986
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision daaf76c5b69282cb044896b7722c73ac7c89f1a1)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8a0632bf9908008ee8db18474bc914d990760986)
@@ -1191,10 +1191,6 @@
             handleUIUserConfirmTreatmentParameters( message );
             break;
 
-        case MSG_ID_UI_TREATMENT_END_REQUEST:
-            handleUIUserEndTreatmentRequest( message );
-            break;
-
         case MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST:
             handleChangePressureLimitsRequest( message );
             break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r12cb82342073207c23708afaa64b25f83f2cdfed -r8a0632bf9908008ee8db18474bc914d990760986
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 12cb82342073207c23708afaa64b25f83f2cdfed)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8a0632bf9908008ee8db18474bc914d990760986)
@@ -1595,56 +1595,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUIUserEndTreatmentRequest function handles a treatment end
- * request message from the UI.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleUIUserEndTreatmentRequest( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    if ( message->hdr.payloadLen == 0 )
-    {
-        result = userRequestEndTreatment();
-    }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, result );
-}
-
-/*********************************************************************//**
- * @brief
- * The sendTreatmentEndResponseMsg function constructs a treatment end
- * request response message to the UI and queues the msg for transmit on
- * the appropriate CAN channel.
- * @details Inputs: none
- * @details Outputs: Treatment end response msg constructed and queued.
- * @param accepted T/F - request accepted?
- * @return TRUE if msg successfully queued for transmit, FALSE if not
- *************************************************************************/
-BOOL sendTreatmentEndResponseMsg( BOOL accepted )
-{
-    BOOL result;
-    MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-
-    // create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_HD_TREATMENT_END_RESPONSE;
-    msg.hdr.payloadLen = sizeof( BOOL );
-
-    memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
-
-    // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The handleTreatmentParametersFromUI function handles a treatment parameters
  * set and validate request message from the UI.
  * @details Inputs: none
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r12cb82342073207c23708afaa64b25f83f2cdfed -r8a0632bf9908008ee8db18474bc914d990760986
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 12cb82342073207c23708afaa64b25f83f2cdfed)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 8a0632bf9908008ee8db18474bc914d990760986)
@@ -90,12 +90,6 @@
 // MSG_ID_HD_START_TREATMENT_RESPONSE
 BOOL sendTreatmentStartResponseMsg( BOOL accepted, U32 reason );
 
-// MSG_ID_UI_TREATMENT_END_REQUEST
-void handleUIUserEndTreatmentRequest( MESSAGE_T *message );
-
-// MSG_ID_HD_TREATMENT_END_RESPONSE
-BOOL sendTreatmentEndResponseMsg( BOOL accepted );
-
 // MSG_ID_UI_NEW_TREATMENT_PARAMS
 void handleTreatmentParametersFromUI( MESSAGE_T *message );