Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -radea34db9066bdc0dbb20f49bdf66c9331a7037c -r040360f8d582c98f98bad3af7d7021e81c305960
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision adea34db9066bdc0dbb20f49bdf66c9331a7037c)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 040360f8d582c98f98bad3af7d7021e81c305960)
@@ -19,7 +19,7 @@
 
 // ********** private definitions **********
 
-#define WAIT_FOR_UPDATE_FROM_UI_MS                  3000000                         ///< Wait for update timeout in milliseconds.
+#define WAIT_FOR_UPDATE_FROM_UI_MS                  1000                         ///< Wait for update timeout in milliseconds.
 
 // ********** private data **********
 
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -radea34db9066bdc0dbb20f49bdf66c9331a7037c -r040360f8d582c98f98bad3af7d7021e81c305960
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision adea34db9066bdc0dbb20f49bdf66c9331a7037c)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 040360f8d582c98f98bad3af7d7021e81c305960)
@@ -15,6 +15,7 @@
 static BL_OP_MODE_T currentMode;                                  ///< The currently active state of the active mode.
 static BL_OP_MODE_T previousMode;                                 ///< Previous state of the operations mode.
 static BL_OP_MODE_T requestedMode;                                ///< Request a new mode.
+static U32 currentSubMode;                                        ///< The currently active state of the active mode.
 
 // ********** private function prototypes **********
 
@@ -29,9 +30,10 @@
  *************************************************************************/
 void initOperationModes( void )
 {
-    currentMode   = MODE_STAND;
-    previousMode  = MODE_STAND;
-    requestedMode = MODE_STAND;
+    currentMode    = MODE_STAND;
+    previousMode   = MODE_STAND;
+    requestedMode  = MODE_STAND;
+    currentSubMode = 0;
 
     initStandbyMode();
     initUpdateMode();
@@ -57,11 +59,11 @@
     switch ( currentMode )
     {
         case MODE_STAND:
-            currentMode = (BL_OP_MODE_T)execStandbyMode();
+            currentSubMode = execStandbyMode();
             break;
 
         case MODE_UPDATE:
-            currentMode = (BL_OP_MODE_T)execUpdateMode();
+            currentSubMode = execUpdateMode();
             break;
 
         default:
@@ -103,11 +105,11 @@
     switch ( newMode )
     {
         case MODE_STAND:
-            currentMode = (BL_OP_MODE_T)transitionToStandbyMode();
+            currentSubMode = transitionToStandbyMode();
             break;
 
         case MODE_UPDATE:
-            currentMode = (BL_OP_MODE_T)transitionToUpdateMode();
+            currentSubMode = transitionToUpdateMode();
             break;
 
         default:
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -radea34db9066bdc0dbb20f49bdf66c9331a7037c -r040360f8d582c98f98bad3af7d7021e81c305960
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision adea34db9066bdc0dbb20f49bdf66c9331a7037c)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 040360f8d582c98f98bad3af7d7021e81c305960)
@@ -143,7 +143,6 @@
     U08 fpgaRev;                                                        ///< Reg 1.  FPGA revision (minor) being reported.
     U08 fpgaRevMajor;                                                   ///< Reg 2.  FPGA revision (major) being reported.
     U08 fpgaRevLab;                                                     ///< Reg 3.  FPGA revision (lab) being reported.
-    U16 fpgaStatus;                                                     ///< Reg 4.  FPGA status register.
 } FPGA_HEADER_T;    // Read only on FPGA
 #pragma pack(pop)
 
@@ -263,16 +262,16 @@
     }
 
     // TODO test code remove
-    U08 data[8];
-    data[0] = getTempRemoveMSGID();
-    data[1] = (U08)fpgaState;
-    data[2] = GET_LSB_OF_WORD( fpgaFlashStatus.fifoRemainingCount );
-    data[3] = GET_MSB_OF_WORD( fpgaFlashStatus.fifoRemainingCount );
-    data[4] = GET_LSB_OF_WORD( fpgaFlashStatus.flashStatusBits );
-    data[5] = GET_MSB_OF_WORD( fpgaFlashStatus.flashStatusBits );
-    data[6] = tempACkStatus;
-    data[7] = (U08)fpgaFlashStatus.isFlashStatusOk;
-    broadcastDataTestRemove(data);
+    //U08 data[8];
+    //data[0] = getTempRemoveMSGID();
+    //data[1] = (U08)fpgaState;
+    //data[2] = GET_LSB_OF_WORD( fpgaFlashStatus.fifoRemainingCount );
+    //data[3] = GET_MSB_OF_WORD( fpgaFlashStatus.fifoRemainingCount );
+    //data[4] = GET_LSB_OF_WORD( fpgaFlashStatus.flashStatusBits );
+    //data[5] = GET_MSB_OF_WORD( fpgaFlashStatus.flashStatusBits );
+    //data[6] = tempACkStatus;
+    //data[7] = (U08)fpgaFlashStatus.isFlashStatusOk;
+    //broadcastDataTestRemove(data);
     // TODO test code remove
 
     switch( fpgaState )
Index: firmware/source/sys_startup.c
===================================================================
diff -u -rdeef095c63fe86de42a7e052e1b9985b0118b02e -r040360f8d582c98f98bad3af7d7021e81c305960
--- firmware/source/sys_startup.c	(.../sys_startup.c)	(revision deef095c63fe86de42a7e052e1b9985b0118b02e)
+++ firmware/source/sys_startup.c	(.../sys_startup.c)	(revision 040360f8d582c98f98bad3af7d7021e81c305960)
@@ -617,10 +617,10 @@
     vimChannelMap( 3, 40, &rtiCompare1Interrupt );
     vimChannelMap( 5, 64, &rtiCompare3Interrupt );
     vimChannelMap( 13, 3, &linHighLevelInterrupt );
-    vimChannelMap( 16, 16, &can1HighLevelInterrupt );
+    vimChannelMap( 16, 15, &can1HighLevelInterrupt );
     vimChannelMap( 29, 13, &can1LowLevelInterrupt );
     vimChannelMap( 40, 5, &dmaBTCAInterrupt );
-    vimChannelMap( 64, 29, &sciHighLevelInterrupt );
+    vimChannelMap( 64, 16, &sciHighLevelInterrupt );
 /* USER CODE END */
 
     /* Configure system response to error conditions signaled to the ESM group1 */