Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r81dc975f13b9308e40aa0e33e0eca2d407276d44 -rb1a0571d530426aefd393d07dbaf7675cd0e4c02
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 81dc975f13b9308e40aa0e33e0eca2d407276d44)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision b1a0571d530426aefd393d07dbaf7675cd0e4c02)
@@ -178,7 +178,7 @@
 
         data.cp1CurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == cp1Direction ? cp1SetSpeed * -1.0 : cp1SetSpeed );
         data.cp1MeasuredSpeed   = ( CONCENTRATE_PUMP_REVERSE_DIR == cp1Direction ? cp1Speed * -1.0 : cp1Speed );
-        data.cp2CurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == cp1Direction ? cp2SetSpeed * -1.0 : cp2SetSpeed );
+        data.cp2CurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == cp2Direction ? cp2SetSpeed * -1.0 : cp2SetSpeed );
         data.cp2MeasuredSpeed   = ( CONCENTRATE_PUMP_REVERSE_DIR == cp2Direction ? cp2Speed * -1.0 : cp2Speed );
 
 #ifndef DISABLE_DIALYSATE_CHECK
Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -rd332a26f463cc5d209be77e562952f70775cf913 -rb1a0571d530426aefd393d07dbaf7675cd0e4c02
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision d332a26f463cc5d209be77e562952f70775cf913)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision b1a0571d530426aefd393d07dbaf7675cd0e4c02)
@@ -510,6 +510,7 @@
  *************************************************************************/
 static void monitorLoadCellsPrimaryBackupDriftOutOfRange( void )
 {
+    // TODO do we need this function at all?
     F32 drift;
 
     F32 loadCellADrift = fabs( getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ) -
Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -r19d00df76fc906db9e514b10f259c39958ff25bb -rb1a0571d530426aefd393d07dbaf7675cd0e4c02
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 19d00df76fc906db9e514b10f259c39958ff25bb)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision b1a0571d530426aefd393d07dbaf7675cd0e4c02)
@@ -140,7 +140,7 @@
     {
         if ( TRUE == didTimeout( hdLostCommStartTime_ms, HD_LOST_COMM_TIMEOUT_MS ) )
         {
-            requestNewOperationMode( DG_MODE_STAN );
+            //requestNewOperationMode( DG_MODE_STAN ); TODO uncomment there is no HD in unit 2
         }
     }
 
Index: firmware/App/Modes/ModeSolo.c
===================================================================
diff -u -r8467f8ff09e382e0991f14d02683080dc811e24e -rb1a0571d530426aefd393d07dbaf7675cd0e4c02
--- firmware/App/Modes/ModeSolo.c	(.../ModeSolo.c)	(revision 8467f8ff09e382e0991f14d02683080dc811e24e)
+++ firmware/App/Modes/ModeSolo.c	(.../ModeSolo.c)	(revision b1a0571d530426aefd393d07dbaf7675cd0e4c02)
@@ -100,7 +100,7 @@
     DG_SOLO_STANDBY_STATE_T result = DG_SOLO_IDLE_STATE;
 
     // if HD is on, transition to DG standby mode
-    if ( TRUE == isHDCommunicating() )
+    //if ( TRUE == isHDCommunicating() ) TODO uncomment. Tehre was no HD in unit 2
     {
         requestNewOperationMode( DG_MODE_STAN );
     }
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rd74b98a3b101ec827cc7da59dd617df9435d79e3 -rb1a0571d530426aefd393d07dbaf7675cd0e4c02
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision d74b98a3b101ec827cc7da59dd617df9435d79e3)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision b1a0571d530426aefd393d07dbaf7675cd0e4c02)
@@ -155,9 +155,9 @@
     DG_STANDBY_MODE_STATE_T state = DG_STANDBY_MODE_STATE_IDLE;
 
     // go to standby solo mode if HD is turned off or stops communicating.
-    if ( FALSE == isHDCommunicating() )  //TODO uncomment
-    //BOOL test = TRUE;
-    //if( FALSE == test )
+    //if ( FALSE == isHDCommunicating() )  //TODO uncomment
+    BOOL test = TRUE;
+    if( FALSE == test )
     {   // TODO if HD comm loss, should we wait an hour or so before going to solo standby?
         requestNewOperationMode( DG_MODE_SOLO );
     }
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r81dc975f13b9308e40aa0e33e0eca2d407276d44 -rb1a0571d530426aefd393d07dbaf7675cd0e4c02
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 81dc975f13b9308e40aa0e33e0eca2d407276d44)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b1a0571d530426aefd393d07dbaf7675cd0e4c02)
@@ -950,7 +950,7 @@
                 U16 msgID;
 
                 memcpy( &msgID, &pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
+                //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID ); TODO uncomment this unit 2 raises this alarm no HD
                 pendingAckList[ i ].used = FALSE;  // take pending message off of list
             }
         }