Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r9102c5da21a15bdaf4bb3bc38795ceb064e3c443 -r62adb12dba3ca647a28460a98c63db425b492bf3
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 9102c5da21a15bdaf4bb3bc38795ceb064e3c443)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 62adb12dba3ca647a28460a98c63db425b492bf3)
@@ -33,11 +33,11 @@
 typedef enum Valves
 {
     FIRST_HYD_VALVE = 0,                          ///< Start of Hydraulics valve group
-    VDR = FIRST_HYD_VALVE,                        ///< Valve Drain (D53)
+    VHO = FIRST_HYD_VALVE,                        ///< Valve Hydraulics Outlet (D14)
     VTD,                                          ///< Valve Thermal Disinfect (D52)
     VHB,                                          ///< Valve Hydraulics Bypass (D8)
     VRP,                                          ///< Valve Rinse Port (D54)
-    VHO,                                          ///< Valve Hydraulics Outlet (D14)
+    VDR,                                          ///< Valve Drain (D53)
     VDB1,                                         ///< Valve DryBcarb Inlet (D65)
     VP1,                                          ///< Valve Purge 1 (D64)
     VPT,                                          ///< Valve Pressure Test (D31)
Index: firmware/App/Drivers/PressureSensor.c
===================================================================
diff -u -r3ea4def3a3a69a00fb96b6089dbd097fa80041de -r62adb12dba3ca647a28460a98c63db425b492bf3
--- firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision 3ea4def3a3a69a00fb96b6089dbd097fa80041de)
+++ firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision 62adb12dba3ca647a28460a98c63db425b492bf3)
@@ -146,7 +146,7 @@
     // Update and convert raw pressures to mmHg
     currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_INPUT ].data = convertPressureReading( getFPGAPRiRawPressure(), PRES_MIN_PSI, HIGH_PRES_MAX_PSI );
     currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_OUTPUT ].data   = convertPressureReading( getFPGAPRoRawPressure(),PRES_MIN_PSI, HIGH_PRES_MAX_PSI );
-    currentPressureReadings[ PRESSURE_SENSOR_HYDRAULICS_OUTLET ].data = convertPressureReading( getFPGAPnRawPressure(),PRES_MIN_PSI, LOW_PRES_MAX_PSI );
+    currentPressureReadings[ PRESSURE_SENSOR_HYDRAULICS_OUTLET ].data = convertPressureReading( getFPGAPnRawPressure(),PRES_MIN_PSI, HIGH_PRES_MAX_PSI );
     currentPressureReadings[ PRESSURE_SENSOR_BIBAG ].data   = convertPressureReading( getFPGAPCbRawPressure(), PRES_MIN_PSI, LOW_PRES_MAX_PSI );
     currentPressureReadings[ PRESSURE_SENSOR_SPENT_DIALYSATE ].data = convertPressureReading( getFPGAPDsRawPressure(), PRES_MIN_PSI, LOW_PRES_MAX_PSI );
     currentPressureReadings[ PRESSURE_SENSOR_FRESH_DIALYSATE ].data   = convertPressureReading( getFPGAPDfRawPressure(), PRES_MIN_PSI, LOW_PRES_MAX_PSI );
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r6679a2cd813b21a8cb4c58b3eeb721e0eef9a10b -r62adb12dba3ca647a28460a98c63db425b492bf3
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 6679a2cd813b21a8cb4c58b3eeb721e0eef9a10b)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 62adb12dba3ca647a28460a98c63db425b492bf3)
@@ -153,8 +153,9 @@
 {
     BOOL status = FALSE;
 
+    //TODO: testing - Comment water pressure check
     // Check Inlet Water Pressure - both Water inlet pressure Input, pressure Output after pressure regulator.
-    checkInletWaterPressure();
+    // checkInletWaterPressure();
 
     // Check any active alarms
     status |= isAlarmActive( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_LOW_RANGE );
@@ -183,13 +184,17 @@
 {
     DD_STANDBY_MODE_STATE_T state = DD_STANDBY_MODE_STATE_IDLE;
 
+    //TODO : Testing - commenting solo mode for now
+
     // go to standby solo mode if TD is turned off or stops communicating.
-    if ( FALSE == isTDCommunicating() )
-    {   // TODO if TD comm loss, do we need solo standby?
-        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_TD_COMMUNICATION_LOSS, 0, 0 )
-        //requestNewOperationMode( DD_MODE_SOLO );
-    }
-    else if ( TRUE == getU32OverrideValue( &pendingStartDDRequest ) )
+//    if ( FALSE == isTDCommunicating() )
+//    {   // TODO if TD comm loss, do we need solo standby?
+//        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_TD_COMMUNICATION_LOSS, 0, 0 )
+//        //requestNewOperationMode( DD_MODE_SOLO );
+//    }
+//    else if ( TRUE == getU32OverrideValue( &pendingStartDDRequest ) )
+
+    if ( TRUE == getU32OverrideValue( &pendingStartDDRequest ) )
     {
         pendingStartDDRequest.data = FALSE;
         requestNewOperationMode( DD_MODE_GEND );