Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision ccfd15568f1e3d304320c2babb2fd4bcf0413304)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6)
@@ -45,9 +45,15 @@
 
 #define DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN         100             ///< Patient connection sub-mode dialysate inlet pump flow rate in mL/min.
 
+#ifndef SKIP_PRIMING
 #define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML         500             ///< Fill reservoir to this volume (in mL) to flush filter and lines.
 #define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      1300            ///< Fill reservoir one to this volume (in mL) during pre-treatment mode.
 #define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      700             ///< Fill reservoir two to this volume (in mL) during pre-treatment mode.
+#else
+#define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML         FILL_RESERVOIR_TO_VOLUME_ML
+#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      FILL_RESERVOIR_TO_VOLUME_ML
+#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      FILL_RESERVOIR_TO_VOLUME_ML
+#endif
 
 #define PRIMARY_HEATER_TARGET_TEMP_OFFSET               2.0             ///< Primary heater target temperature offset from trimmer heater temperature.
 
@@ -247,7 +253,13 @@
  *************************************************************************/
 void signalUserConfirmInstallation( void )
 {
-    if ( ( MODE_PRET == getCurrentOperationMode() ) && ( HD_PRE_TREATMENT_CART_INSTALL_STATE == currentPreTreatmentState ) )
+    F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
+    F32 hepRate  = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
+
+    // Accept installation confirmation if we are in install state of pre-treatment mode and syringe is detected or Heparin not being used in this treatment.
+    if ( ( MODE_PRET == getCurrentOperationMode() ) &&
+         ( HD_PRE_TREATMENT_CART_INSTALL_STATE == currentPreTreatmentState ) &&
+         ( ( TRUE == isSyringeDetected() ) || ( ( bolusVol < NEARLY_ZERO ) && ( hepRate < NEARLY_ZERO ) ) ) )
     {
         confirmInstallRequested = TRUE;
     }
@@ -436,7 +448,7 @@
         preTreatmentData.recircState = getPreTreatmentRecircState();
         preTreatmentData.patientConnectionState = 0;
 
-        broadcastPreTreatmentState( &preTreatmentData );
+        broadcastData( MSG_ID_PRE_TREATMENT_STATE, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&preTreatmentData, sizeof( PRE_TREATMENT_STATE_DATA_T ) );
         preTreatmentPublishTimerCounter = 0;
     }
 }
@@ -666,7 +678,7 @@
     {
         if ( submodeCompleteTransitionTimeCounter++ >= SUBMODE_COMPLETE_UI_TRANSITION_TIME_COUNT )
         {
-            setOcclusionInstallLevels();  // Record occlusion pressure levels after a new cartridge is installed.
+            setOcclusionInstallLevel();  // Record occlusion pressure level after a new cartridge is installed.
             submodeCompleteTransitionTimeCounter = 0;
             state = HD_PRE_TREATMENT_PRIME_STATE;
             transitionToPrime();
@@ -767,7 +779,9 @@
     if ( TRUE == treatmentStartRequested )
     {
         DG_RESERVOIR_ID_T const activeRes = getDGActiveReservoir();
+
         setStartReservoirVolume( activeRes );
+        resetHeparinVolumeDelivered();  // get clean starting volume/position before we start treatment
         requestNewOperationMode( MODE_TREA );
     }
 
@@ -872,7 +886,7 @@
         if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) )
         {
             state = PRE_TREATMENT_RESERVOIR_MGMT_DRAIN_CMD_RESP_STATE;
-            cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE );
+            cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE, FALSE, TRUE );
         }
     }