Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r9798f57bc288270fe058fe098a76088cbb34d50c -rbb81ef75054179b37eaa3750a631ad1c67692008
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 9798f57bc288270fe058fe098a76088cbb34d50c)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision bb81ef75054179b37eaa3750a631ad1c67692008)
@@ -339,7 +339,9 @@
     }
     else
     {
+#ifndef DISABLE_SYRINGE_PUMP
         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (F32)SW_FAULT_ID_HD_SYRINGE_INVALID_BOLUS_CMD, tgtRate )
+#endif
     }
 
     return syringePumpBolusRequested;
@@ -366,7 +368,9 @@
     }
     else
     {
+#ifndef DISABLE_SYRINGE_PUMP
         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (F32)SW_FAULT_ID_HD_SYRINGE_INVALID_CONT_CMD, flowRate )
+#endif
     }
 
     return syringePumpContinuousRequested;
@@ -629,7 +633,7 @@
         // Check ADC read is fresh
         if ( lastSyringePumpADCReadCtr == adcReadCtr )  // TODO - add persistence
         {
-            activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR );
+//            activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR );
         }
         lastSyringePumpADCReadCtr = adcReadCtr;
     }
Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -r8b1a3c2d95817e6d7619783e86a91c3d32ea70b2 -rbb81ef75054179b37eaa3750a631ad1c67692008
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 8b1a3c2d95817e6d7619783e86a91c3d32ea70b2)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision bb81ef75054179b37eaa3750a631ad1c67692008)
@@ -79,10 +79,6 @@
             {
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_AC_POWER_LOST, (U32)batteryStatus );
             }
-            else
-            {
-                clearAlarm( ALARM_ID_HD_AC_POWER_LOST );
-            }
         }
     }
 }
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r7d0b523acfbe441a8c323022482d2422488c384a -rbb81ef75054179b37eaa3750a631ad1c67692008
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 7d0b523acfbe441a8c323022482d2422488c384a)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision bb81ef75054179b37eaa3750a631ad1c67692008)
@@ -23,8 +23,8 @@
 // ********** version **********
 
 #define HD_VERSION_MAJOR        0
-#define HD_VERSION_MINOR        4
-#define HD_VERSION_MICRO        5
+#define HD_VERSION_MINOR        5
+#define HD_VERSION_MICRO        0
 #define HD_VERSION_BUILD        0
 
 // ********** development build switches **********
@@ -49,7 +49,7 @@
     #define DISABLE_PUMP_SPEED_CHECKS       1           // Do not error on HD pump speed checks
     #define DISABLE_PUMP_DIRECTION_CHECKS   1           // Do not error on HD pump direction checks
 //    #define DISABLE_SALINE_BOLUS_CHECKS     1           // Do not error on HD saline bolus checks
-//    #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
+    #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
     #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
 //    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
     #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r3eab17f4bf956168bd11eb0a54c2dce66b54946a -rbb81ef75054179b37eaa3750a631ad1c67692008
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 3eab17f4bf956168bd11eb0a54c2dce66b54946a)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision bb81ef75054179b37eaa3750a631ad1c67692008)
@@ -40,8 +40,8 @@
 
 #define DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN         100             ///< Patient connection sub-mode dialysate inlet pump flow rate in mL/min.
 
-#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.
+#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      500 //1300            ///< Fill reservoir one to this volume (in mL) during pre-treatment mode.
+#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      100 //700             ///< Fill reservoir two to this volume (in mL) during pre-treatment mode.
 
 /// States of the pre-treatment reservoir management state machine.
 typedef enum PreTreatmentReservoirMgmt_States
@@ -504,6 +504,10 @@
             cmdSetDGDialysateTargetTemps( 39.0, 37.0 );
             transitionToConsumableSelfTest();
         }
+        else
+        {
+            cmdStopDG();
+        }
     }
 
     return state;
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r8c00197ce69e80f1967aa3f2eb36beb3573f36f3 -rbb81ef75054179b37eaa3750a631ad1c67692008
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 8c00197ce69e80f1967aa3f2eb36beb3573f36f3)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision bb81ef75054179b37eaa3750a631ad1c67692008)
@@ -56,7 +56,7 @@
 /* INIT     */{ MODE_FAUL, MODE_NLEG, MODE_INIT, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
 /* STAN     */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_STAN, MODE_TPAR, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
 /* TPAR     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_TPAR, MODE_PRET, MODE_NLEG, MODE_NLEG, },
-/* PRET     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_PRET, MODE_TREA, MODE_NLEG, },
+/* PRET     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_PRET, MODE_TREA, MODE_POST, },
 /* TREA     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_TREA, MODE_POST, },
 /* POST     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_POST, }, };
 
Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r809d8fc395e63afc52a13fc30087d2cf50ad4d9a -rbb81ef75054179b37eaa3750a631ad1c67692008
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 809d8fc395e63afc52a13fc30087d2cf50ad4d9a)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision bb81ef75054179b37eaa3750a631ad1c67692008)
@@ -137,7 +137,7 @@
 
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
-    setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE );
+    setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
 
     resetPrimeFlags();
 }
Index: firmware/App/Tasks/TaskPriority.c
===================================================================
diff -u -r1afd5c87ef15399998a743c2ebcafe2cc03bd363 -rbb81ef75054179b37eaa3750a631ad1c67692008
--- firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision 1afd5c87ef15399998a743c2ebcafe2cc03bd363)
+++ firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision bb81ef75054179b37eaa3750a631ad1c67692008)
@@ -68,8 +68,10 @@
         // Monitor air trap level sensors
         execAirTrapMonitor();
 
+#ifndef DISABLE_SYRINGE_PUMP
         // Control/Monitor syringe pump
         execSyringePump();
+#endif
 
         // Monitor blood pump and flow
         execBloodFlowMonitor();