Index: firmware/App/Common.h
===================================================================
diff -u -r0595b4b31cef5980bc589ff7ce39a4e97bc81d8d -r012573b1913d1bfd2357acfadcad6bb20b295ad9
--- firmware/App/Common.h	(.../Common.h)	(revision 0595b4b31cef5980bc589ff7ce39a4e97bc81d8d)
+++ firmware/App/Common.h	(.../Common.h)	(revision 012573b1913d1bfd2357acfadcad6bb20b295ad9)
@@ -14,7 +14,7 @@
 #define CAN_MESSAGE_PAYLOAD_SIZE              8
 #define FIRMWARE_START_ADDRESS                0x00010000
 #define FIRMWARE_CRC_TABLE_ADDRESS            0x10020             ///< The starting address of CRC table for firmware image.
-#define SW_UPDATE_FLASH_BUFFER_SIZE           128
+#define SW_UPDATE_FLASH_BUFFER_SIZE           256
 #define MASK_OFF_MSB                          0x00FF      ///< Bits to mask off the most significant byte of a 2-byte word
 #define MASK_OFF_LSB                          0xFF00      ///< Bits to mask off the least significant byte of a 2-byte word
 #define SHIFT_8_BITS_FOR_BYTE_SHIFT           8           ///< Number of bits to shift in order to shift a byte
@@ -78,8 +78,9 @@
     SW_UPDATE_TD_UPDATE,        // 0x602
     SW_UPDATE_DD_UPDATE,        // 0x603
     SW_UPDATE_RO_UPDATE,        // 0x604
-    PLACE_HOLDER_TO_REMOVE_CAN, // 0x606
-    SW_UPDATE_RESP,             // 0x607
+    PLACE_HOLDER_TO_REMOVE_CAN, // 0x605
+    SW_UPDATE_RESP,             // 0x606
+    SW_TEST,                    // 0x607  // TODO remove
     NUM_OF_SW_UPDATE_MBOXES,
 } SW_UPDATE_CAN_MAIL_BOX_T;