Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r9e2779d825ea7e7b3445fa365f7bc2206fc0613a -r012573b1913d1bfd2357acfadcad6bb20b295ad9
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 9e2779d825ea7e7b3445fa365f7bc2206fc0613a)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 012573b1913d1bfd2357acfadcad6bb20b295ad9)
@@ -109,25 +109,26 @@
     MODE_STANDBY_STATE_T state = STANDBY_CHECK_FW_AND_FPGA_IMAGES_STATE;
     BOOL isFirmwareImageValid  = FALSE;
     BOOL isFPGAImageValid      = FALSE;
-
+    // TODo timeout and wait for a while prior to transitioning
+    // TODO why a bad code passes the CRC?
     _disable_IRQ();
     if ( TRUE == isFWCRCTableValid() )
     {
         isFirmwareImageValid = runFWIntegrityTest();
     }
     _enable_IRQ();
 
-    if ( TRUE == isFPGAIDValid() )
+    //if ( TRUE == isFPGAIDValid() )
     {
         isFPGAImageValid = TRUE;
     }
 
-    if ( ( TRUE == isFirmwareImageValid ) && ( TRUE == isFPGAImageValid ) )
-    {
+    //if ( ( TRUE == isFirmwareImageValid ) && ( TRUE == isFPGAImageValid ) )
+    //{
         // All good, jump to application
-        jumpToApplication();
-    }
-    else
+    //    jumpToApplication();
+    //}
+    //else
     {
         // TODO do we need to try a few times prior to tansitioning to Idle?