Index: firmware/App/Modes/ModeUpdate.c
===================================================================
diff -u -r3a0dc476f0f42bb7ebadc7d6109a0b5b6581cce4 -r893caf9f58a08a2bd31068806e09603041d64add
--- firmware/App/Modes/ModeUpdate.c	(.../ModeUpdate.c)	(revision 3a0dc476f0f42bb7ebadc7d6109a0b5b6581cce4)
+++ firmware/App/Modes/ModeUpdate.c	(.../ModeUpdate.c)	(revision 893caf9f58a08a2bd31068806e09603041d64add)
@@ -6,6 +6,7 @@
  */
 
 #include "CommBuffers.h"
+#include "Download.h"
 #include "ModeUpdate.h"
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
@@ -27,8 +28,8 @@
     // Clear the NV status to start from the start address of the firmware
     clearSWUpdateNVStatus();
     // TODO clear FPGA clear stuff here
-    // Clear the command CAN buffer after it got the mode changed to update mode
-    clearSWUpdateBuffer( SW_UPDATE_COMMAD );
+    // Got the update command so we are in the update mode. Clear the command
+    clearSWUpdateCommandState();
 
     return 0;
 }
@@ -60,13 +61,9 @@
 
 static MODE_SW_UPDATE_STATE_T handleUpdateModeUpdateState( void )
 {
-    SW_UPDATE_CMD_STATUS_T SWUpdateCmdStatus;
-
     MODE_SW_UPDATE_STATE_T state = SW_UPDATE_UPDATE_STATE;
 
-    getSWUpdateCmdStatus( &SWUpdateCmdStatus );
-
-    switch( SWUpdateCmdStatus.updateCmd )
+    switch( getSWUpdateCommandState() )
     {
         case UPDATE_CMD_VERIFY:
             state = SW_UPDATE_VERIFY_STATE;