Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r7cb8a81b80e92f127ee4e248874959d962786c2a -r3c3ce491ef31e52b19e5166a04467ea359fbfdae
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 7cb8a81b80e92f127ee4e248874959d962786c2a)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 3c3ce491ef31e52b19e5166a04467ea359fbfdae)
@@ -44,14 +44,14 @@
 
 #define BAL_CHAMBER_DATA_PUBLISH_INTERVAL           ( 250 / TASK_GENERAL_INTERVAL )             ///< Interval (ms/task time) at which the balancing chamber data published.
 #define BAL_CHAMBER_FILL_PRES_DROP_MS               ( 200 / TASK_GENERAL_INTERVAL )             ///< Time (ms/tasktime) to confirm the balancing chamber filling started and corrosponding valves opened.
-#ifdef __D65_OPENING_DISABLED__
+#if 1
 #define BAL_CHAMBER_FILL_COMPLETE_MS                ( 100 / TASK_GENERAL_INTERVAL )             ///< Time (ms/tasktime) to confirm the balancing chamber fill completed and pressure is within range
 #else
 #define BAL_CHAMBER_FILL_COMPLETE_MS                ( 300 / TASK_GENERAL_INTERVAL )             ///< Time (ms/tasktime) to confirm the balancing chamber fill completed and pressure is within range
 #endif
 #define SPENT_FILL_COMPLETE_QD_LOW_RISE_MAX_MLPM    300.0F                                      ///< For Qd <= 300 mL/min (Diener 1000).
 #define SPENT_FILL_COMPLETE_DP_RISE_PSIG            0.5F                                        ///< Minimum 100 ms spent pressure rise (current minus n-2) to count as a rise hit at low Qd.
-#define SPENT_FILL_COMPLETE_DP_RISE_HIGH_QD_PSIG    5.0F                                        ///< Minimum spent pressure rise for Diener 2000 or Qd > 300 mL/min.
+#define SPENT_FILL_COMPLETE_DP_RISE_HIGH_QD_PSIG    3.0F                                        ///< Minimum spent pressure rise for Diener 2000 or Qd > 300 mL/min.
 #define SPENT_FILL_SLOPE_SPENT_PRESSURE_HIGH_PSIG   2.0F                                        ///< Above this spent pressure rise, only one rise hit is required.
 #define SPENT_FILL_SLOPE_MAX_RISE_HITS              2                                           ///< Rise hits required when Qd <= 150 in the low spent-pressure band.
 #define SPENT_FILL_DETECT_COUNT_TOL_PCT             1.0F                                        ///< Allowed detection timing tolerance as a fraction of expected BC switching count.
@@ -341,7 +341,9 @@
  *************************************************************************/
 static void scheduleFirstCycleRelaxAfterQdApply( void )
 {
-    bcSwitchingBasedOnClosedPeriodCounter = 2;
+    //TODO : revert after testing
+    //bcSwitchingBasedOnClosedPeriodCounter = 2;
+    bcSwitchingBasedOnClosedPeriodCounter = 4;
 }
 
 /*********************************************************************//**
@@ -851,7 +853,7 @@
         state = BAL_CHAMBER_STATE_IDLE;
     }
 
-#ifdef __D65_OPENING_DISABLED__
+#if 1
     // Check fresh dialysate pressure back in range to indicate fresh fill complete.
     if ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) )
     {
@@ -1118,7 +1120,7 @@
     freshDialPressure               = getFilteredPressure( D18_PRES );
     spentDialPressure               = getFilteredPressure( D51_PRES );
 
-#ifdef __D65_OPENING_DISABLED__
+#if 1
     // Check fresh dialysate pressure back in range to indicate fresh fill complete.
     if ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) )
     {
Index: firmware/App/Controllers/DryBiCart.c
===================================================================
diff -u -r50aa4c2d630370fa62f871b82db3afc70d763dcb -r3c3ce491ef31e52b19e5166a04467ea359fbfdae
--- firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision 50aa4c2d630370fa62f871b82db3afc70d763dcb)
+++ firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision 3c3ce491ef31e52b19e5166a04467ea359fbfdae)
@@ -56,7 +56,7 @@
         DRY_BICART_WCID2_FILL_COMPLETE_PRESSURE_PSI : DRY_BICART_WCID1_FILL_COMPLETE_PRESSURE_PSI ) ///< Get fill complete pressure based on the WCID configuration
 #define DRY_BICART_FILL_INITIATE_PRESSURE_PSI           1.5F                                        ///< Minimum pressure required to initiate the dry bicart fill process.
 #define DRY_BICART_FILL_COMPLETE_SUPPLY_PRESSURE_PSI    10.0F                                       ///< Maximum pressure allowed at bicart fill during supply process/state
-#define DRY_BICART_FILL_INITIATE_SUPPLY_PRESSURE_PSI    3.0F                                        ///< Minimum pressure required to initiate the dry bicart fill during supply process/state
+#define DRY_BICART_FILL_INITIATE_SUPPLY_PRESSURE_PSI    4.0F                                        ///< Minimum pressure required to initiate the dry bicart fill during supply process/state
 #define DRY_BICART_MAX_FILL_CYCLE_CNT                   10                                          ///< Max fill cycle allowed (by override) for dry bicart fill/mix with water.
 #define DRY_BICART_MINIMUM_FILL_CYCLE_CNT               3                                           ///< Minimum fill cycle count for filling dry bicart
 // Dry Bicart Fill Vent