diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ParTest/ParTest.c b/Demo/ARM9_AT91SAM9XE_IAR/ParTest/ParTest.c
index 8a5c6d6c12..80ac9a8d5e 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/ParTest/ParTest.c
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ParTest/ParTest.c
@@ -49,6 +49,9 @@
 
 #include "FreeRTOS.h"
 #include "partest.h"
+#include "led.h"
+
+#define partstNUM_LEDS			( 4 )
 
 /*-----------------------------------------------------------
  * Simple parallel port IO routines for the LED's.
@@ -56,19 +59,37 @@
 
 void vParTestInitialise( void )
 {	
-    LED_Configure( 0 );
-    LED_Configure( 1 );
+unsigned long ul;
+
+	for( ul = 0; ul < partstNUM_LEDS; ul++ )
+	{
+		LED_Configure( ul );
+	}
 }
 /*-----------------------------------------------------------*/
 
 void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue )
 {
+	if( uxLED < partstNUM_LEDS )
+	{
+		if( xValue == 0 )
+		{
+			LED_Clear( uxLED );
+		}
+		else
+		{
+			LED_Set( uxLED );
+		}
+	}
 }
 /*-----------------------------------------------------------*/
 
 void vParTestToggleLED( unsigned portBASE_TYPE uxLED )
 {
-    LED_Toggle(1);
+	if( uxLED < partstNUM_LEDS )
+	{
+    	LED_Toggle( uxLED );
+	}
 }
 
 
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewd b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewd
index 5fde1283a4..1f004b52aa 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewd
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <project>
-	<fileVersion>1</fileVersion>
+  <fileVersion>2</fileVersion>
   <configuration>
     <name>at91sam9xe128_flash</name>
     <toolchain>
@@ -12,7 +12,7 @@
       <name>C-SPY</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>14</version>
+        <version>18</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -95,10 +95,6 @@
           <name>OCDownloadAttachToProgram</name>
           <state>0</state>
         </option>
-        <option>
-          <name>FlashLoaders</name>
-          <state>,,,0x200000,(default),</state>
-        </option>
         <option>
           <name>UseFlashLoader</name>
           <state>1</state>
@@ -107,6 +103,22 @@
           <name>CLowLevel</name>
           <state>1</state>
         </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV2</name>
+          <state>,,,0x200000,(default),</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -253,7 +265,7 @@
       <name>JLINK_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>8</version>
+        <version>10</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -304,14 +316,6 @@
           <name>CCJLinkTCPIP</name>
           <state>aaa.bbb.ccc.ddd</state>
         </option>
-        <option>
-          <name>CCJLinkResetRadio</name>
-          <state>2</state>
-        </option>
-        <option>
-          <name>CCJLinkResetInitSeq</name>
-          <state>0</state>
-        </option>
         <option>
           <name>CCJLinkSpeedRadioV2</name>
           <state>2</state>
@@ -369,6 +373,15 @@
           <name>OCJLinkAttachSlave</name>
           <state>1</state>
         </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>0</version>
+          <state>5</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -400,7 +413,7 @@
       <name>MACRAIGOR_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>2</version>
+        <version>3</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -475,6 +488,14 @@
           <name>CCJTagUpdateBreakpoints</name>
           <state>main</state>
         </option>
+        <option>
+          <name>CCMacraigorInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMacraigorInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -565,11 +586,11 @@
     </settings>
     <debuggerPlugins>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -585,7 +606,11 @@
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -604,6 +629,10 @@
         <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
     </debuggerPlugins>
   </configuration>
   <configuration>
@@ -616,7 +645,7 @@
       <name>C-SPY</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>14</version>
+        <version>18</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -699,10 +728,6 @@
           <name>OCDownloadAttachToProgram</name>
           <state>0</state>
         </option>
-        <option>
-          <name>FlashLoaders</name>
-          <state>,,,0x200000,(default),</state>
-        </option>
         <option>
           <name>UseFlashLoader</name>
           <state>0</state>
@@ -711,6 +736,22 @@
           <name>CLowLevel</name>
           <state>1</state>
         </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV2</name>
+          <state>,,,0x200000,(default),</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -857,7 +898,7 @@
       <name>JLINK_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>8</version>
+        <version>10</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -908,14 +949,6 @@
           <name>CCJLinkTCPIP</name>
           <state>aaa.bbb.ccc.ddd</state>
         </option>
-        <option>
-          <name>CCJLinkResetRadio</name>
-          <state>2</state>
-        </option>
-        <option>
-          <name>CCJLinkResetInitSeq</name>
-          <state>0</state>
-        </option>
         <option>
           <name>CCJLinkSpeedRadioV2</name>
           <state>2</state>
@@ -973,6 +1006,15 @@
           <name>OCJLinkAttachSlave</name>
           <state>1</state>
         </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>0</version>
+          <state>5</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -1004,7 +1046,7 @@
       <name>MACRAIGOR_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>2</version>
+        <version>3</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -1079,6 +1121,14 @@
           <name>CCJTagUpdateBreakpoints</name>
           <state>main</state>
         </option>
+        <option>
+          <name>CCMacraigorInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMacraigorInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -1169,11 +1219,11 @@
     </settings>
     <debuggerPlugins>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -1189,7 +1239,11 @@
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -1208,6 +1262,10 @@
         <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
     </debuggerPlugins>
   </configuration>
   <configuration>
@@ -1220,7 +1278,7 @@
       <name>C-SPY</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>14</version>
+        <version>18</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -1303,10 +1361,6 @@
           <name>OCDownloadAttachToProgram</name>
           <state>0</state>
         </option>
-        <option>
-          <name>FlashLoaders</name>
-          <state>,,,0x200000,(default),</state>
-        </option>
         <option>
           <name>UseFlashLoader</name>
           <state>0</state>
@@ -1315,6 +1369,22 @@
           <name>CLowLevel</name>
           <state>1</state>
         </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV2</name>
+          <state>,,,0x200000,(default),</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -1461,7 +1531,7 @@
       <name>JLINK_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>8</version>
+        <version>10</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -1512,14 +1582,6 @@
           <name>CCJLinkTCPIP</name>
           <state>aaa.bbb.ccc.ddd</state>
         </option>
-        <option>
-          <name>CCJLinkResetRadio</name>
-          <state>2</state>
-        </option>
-        <option>
-          <name>CCJLinkResetInitSeq</name>
-          <state>0</state>
-        </option>
         <option>
           <name>CCJLinkSpeedRadioV2</name>
           <state>2</state>
@@ -1577,6 +1639,15 @@
           <name>OCJLinkAttachSlave</name>
           <state>1</state>
         </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>0</version>
+          <state>5</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -1608,7 +1679,7 @@
       <name>MACRAIGOR_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>2</version>
+        <version>3</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -1683,6 +1754,14 @@
           <name>CCJTagUpdateBreakpoints</name>
           <state>main</state>
         </option>
+        <option>
+          <name>CCMacraigorInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMacraigorInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -1773,11 +1852,11 @@
     </settings>
     <debuggerPlugins>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -1793,7 +1872,11 @@
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -1812,6 +1895,10 @@
         <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
     </debuggerPlugins>
   </configuration>
   <configuration>
@@ -1824,7 +1911,7 @@
       <name>C-SPY</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>14</version>
+        <version>18</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -1857,7 +1944,7 @@
         </option>
         <option>
           <name>MemFile</name>
-          <state>$TOOLKIT_DIR$\CONFIG\debugger\Atmel\ioat91sam9xe256.ddf</state>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\Atmel\ioAT91SAM9XE256.ddf</state>
         </option>
         <option>
           <name>RunToEnable</name>
@@ -1901,16 +1988,12 @@
         </option>
         <option>
           <name>OCLastSavedByProductVersion</name>
-          <state>5.10.5.376</state>
+          <state>5.20.0.50986</state>
         </option>
         <option>
           <name>OCDownloadAttachToProgram</name>
           <state>0</state>
         </option>
-        <option>
-          <name>FlashLoaders</name>
-          <state>,,,0x200000,(default),</state>
-        </option>
         <option>
           <name>UseFlashLoader</name>
           <state>1</state>
@@ -1919,6 +2002,22 @@
           <name>CLowLevel</name>
           <state>1</state>
         </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV2</name>
+          <state>,,,0x200000,(default),</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -2065,7 +2164,7 @@
       <name>JLINK_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>8</version>
+        <version>10</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -2116,14 +2215,6 @@
           <name>CCJLinkTCPIP</name>
           <state>aaa.bbb.ccc.ddd</state>
         </option>
-        <option>
-          <name>CCJLinkResetRadio</name>
-          <state>2</state>
-        </option>
-        <option>
-          <name>CCJLinkResetInitSeq</name>
-          <state>0</state>
-        </option>
         <option>
           <name>CCJLinkSpeedRadioV2</name>
           <state>2</state>
@@ -2181,6 +2272,15 @@
           <name>OCJLinkAttachSlave</name>
           <state>1</state>
         </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>0</version>
+          <state>5</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -2212,7 +2312,7 @@
       <name>MACRAIGOR_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>2</version>
+        <version>3</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -2287,6 +2387,14 @@
           <name>CCJTagUpdateBreakpoints</name>
           <state>main</state>
         </option>
+        <option>
+          <name>CCMacraigorInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMacraigorInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -2377,11 +2485,11 @@
     </settings>
     <debuggerPlugins>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -2397,7 +2505,11 @@
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -2416,6 +2528,10 @@
         <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
     </debuggerPlugins>
   </configuration>
   <configuration>
@@ -2428,7 +2544,7 @@
       <name>C-SPY</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>14</version>
+        <version>18</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -2511,10 +2627,6 @@
           <name>OCDownloadAttachToProgram</name>
           <state>0</state>
         </option>
-        <option>
-          <name>FlashLoaders</name>
-          <state>,,,0x200000,(default),</state>
-        </option>
         <option>
           <name>UseFlashLoader</name>
           <state>0</state>
@@ -2523,6 +2635,22 @@
           <name>CLowLevel</name>
           <state>1</state>
         </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV2</name>
+          <state>,,,0x200000,(default),</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -2669,7 +2797,7 @@
       <name>JLINK_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>8</version>
+        <version>10</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -2720,14 +2848,6 @@
           <name>CCJLinkTCPIP</name>
           <state>aaa.bbb.ccc.ddd</state>
         </option>
-        <option>
-          <name>CCJLinkResetRadio</name>
-          <state>2</state>
-        </option>
-        <option>
-          <name>CCJLinkResetInitSeq</name>
-          <state>0</state>
-        </option>
         <option>
           <name>CCJLinkSpeedRadioV2</name>
           <state>2</state>
@@ -2785,6 +2905,15 @@
           <name>OCJLinkAttachSlave</name>
           <state>1</state>
         </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>0</version>
+          <state>5</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -2816,7 +2945,7 @@
       <name>MACRAIGOR_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>2</version>
+        <version>3</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -2891,6 +3020,14 @@
           <name>CCJTagUpdateBreakpoints</name>
           <state>main</state>
         </option>
+        <option>
+          <name>CCMacraigorInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMacraigorInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -2981,11 +3118,11 @@
     </settings>
     <debuggerPlugins>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -3001,7 +3138,11 @@
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -3020,6 +3161,10 @@
         <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
     </debuggerPlugins>
   </configuration>
   <configuration>
@@ -3032,7 +3177,7 @@
       <name>C-SPY</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>14</version>
+        <version>18</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -3115,10 +3260,6 @@
           <name>OCDownloadAttachToProgram</name>
           <state>0</state>
         </option>
-        <option>
-          <name>FlashLoaders</name>
-          <state>,,,0x200000,(default),</state>
-        </option>
         <option>
           <name>UseFlashLoader</name>
           <state>0</state>
@@ -3127,6 +3268,22 @@
           <name>CLowLevel</name>
           <state>1</state>
         </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV2</name>
+          <state>,,,0x200000,(default),</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -3273,7 +3430,7 @@
       <name>JLINK_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>8</version>
+        <version>10</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -3324,14 +3481,6 @@
           <name>CCJLinkTCPIP</name>
           <state>aaa.bbb.ccc.ddd</state>
         </option>
-        <option>
-          <name>CCJLinkResetRadio</name>
-          <state>2</state>
-        </option>
-        <option>
-          <name>CCJLinkResetInitSeq</name>
-          <state>0</state>
-        </option>
         <option>
           <name>CCJLinkSpeedRadioV2</name>
           <state>2</state>
@@ -3389,6 +3538,15 @@
           <name>OCJLinkAttachSlave</name>
           <state>1</state>
         </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>0</version>
+          <state>5</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -3420,7 +3578,7 @@
       <name>MACRAIGOR_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>2</version>
+        <version>3</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -3495,6 +3653,14 @@
           <name>CCJTagUpdateBreakpoints</name>
           <state>main</state>
         </option>
+        <option>
+          <name>CCMacraigorInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMacraigorInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -3585,11 +3751,11 @@
     </settings>
     <debuggerPlugins>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -3605,7 +3771,11 @@
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -3624,6 +3794,10 @@
         <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
     </debuggerPlugins>
   </configuration>
   <configuration>
@@ -3636,7 +3810,7 @@
       <name>C-SPY</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>14</version>
+        <version>18</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -3669,11 +3843,11 @@
         </option>
         <option>
           <name>MemFile</name>
-          <state>$TOOLKIT_DIR$\CONFIG\debugger\Atmel\ioat91sam9xe512.ddf</state>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\Atmel\ioAT91SAM9XE512.ddf</state>
         </option>
         <option>
           <name>RunToEnable</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>RunToName</name>
@@ -3701,7 +3875,7 @@
         </option>
         <option>
           <name>OCDownloadVerifyAll</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>OCProductVersion</name>
@@ -3713,16 +3887,12 @@
         </option>
         <option>
           <name>OCLastSavedByProductVersion</name>
-          <state>5.10.5.376</state>
+          <state>5.20.0.50986</state>
         </option>
         <option>
           <name>OCDownloadAttachToProgram</name>
           <state>0</state>
         </option>
-        <option>
-          <name>FlashLoaders</name>
-          <state>,,,0x200000,(default),</state>
-        </option>
         <option>
           <name>UseFlashLoader</name>
           <state>1</state>
@@ -3731,6 +3901,22 @@
           <name>CLowLevel</name>
           <state>1</state>
         </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV2</name>
+          <state>,,,0x200000,(default),</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -3877,7 +4063,7 @@
       <name>JLINK_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>8</version>
+        <version>10</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -3928,17 +4114,9 @@
           <name>CCJLinkTCPIP</name>
           <state>aaa.bbb.ccc.ddd</state>
         </option>
-        <option>
-          <name>CCJLinkResetRadio</name>
-          <state>2</state>
-        </option>
-        <option>
-          <name>CCJLinkResetInitSeq</name>
-          <state>0</state>
-        </option>
         <option>
           <name>CCJLinkSpeedRadioV2</name>
-          <state>2</state>
+          <state>0</state>
         </option>
         <option>
           <name>CCUSBDevice</name>
@@ -3993,6 +4171,15 @@
           <name>OCJLinkAttachSlave</name>
           <state>1</state>
         </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -4024,7 +4211,7 @@
       <name>MACRAIGOR_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>2</version>
+        <version>3</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -4099,6 +4286,14 @@
           <name>CCJTagUpdateBreakpoints</name>
           <state>main</state>
         </option>
+        <option>
+          <name>CCMacraigorInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMacraigorInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -4189,11 +4384,11 @@
     </settings>
     <debuggerPlugins>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -4209,7 +4404,11 @@
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -4228,6 +4427,10 @@
         <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
     </debuggerPlugins>
   </configuration>
   <configuration>
@@ -4240,7 +4443,7 @@
       <name>C-SPY</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>14</version>
+        <version>18</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -4323,10 +4526,6 @@
           <name>OCDownloadAttachToProgram</name>
           <state>0</state>
         </option>
-        <option>
-          <name>FlashLoaders</name>
-          <state>,,,0x200000,(default),</state>
-        </option>
         <option>
           <name>UseFlashLoader</name>
           <state>0</state>
@@ -4335,6 +4534,22 @@
           <name>CLowLevel</name>
           <state>1</state>
         </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV2</name>
+          <state>,,,0x200000,(default),</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -4481,7 +4696,7 @@
       <name>JLINK_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>8</version>
+        <version>10</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -4532,14 +4747,6 @@
           <name>CCJLinkTCPIP</name>
           <state>aaa.bbb.ccc.ddd</state>
         </option>
-        <option>
-          <name>CCJLinkResetRadio</name>
-          <state>2</state>
-        </option>
-        <option>
-          <name>CCJLinkResetInitSeq</name>
-          <state>0</state>
-        </option>
         <option>
           <name>CCJLinkSpeedRadioV2</name>
           <state>2</state>
@@ -4597,6 +4804,15 @@
           <name>OCJLinkAttachSlave</name>
           <state>1</state>
         </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>0</version>
+          <state>5</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -4628,7 +4844,7 @@
       <name>MACRAIGOR_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>2</version>
+        <version>3</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -4703,6 +4919,14 @@
           <name>CCJTagUpdateBreakpoints</name>
           <state>main</state>
         </option>
+        <option>
+          <name>CCMacraigorInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMacraigorInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -4793,11 +5017,11 @@
     </settings>
     <debuggerPlugins>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -4813,7 +5037,11 @@
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -4832,6 +5060,10 @@
         <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
     </debuggerPlugins>
   </configuration>
   <configuration>
@@ -4844,7 +5076,7 @@
       <name>C-SPY</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>14</version>
+        <version>18</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -4927,10 +5159,6 @@
           <name>OCDownloadAttachToProgram</name>
           <state>0</state>
         </option>
-        <option>
-          <name>FlashLoaders</name>
-          <state>,,,0x200000,(default),</state>
-        </option>
         <option>
           <name>UseFlashLoader</name>
           <state>0</state>
@@ -4939,6 +5167,22 @@
           <name>CLowLevel</name>
           <state>1</state>
         </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV2</name>
+          <state>,,,0x200000,(default),</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -5085,7 +5329,7 @@
       <name>JLINK_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>8</version>
+        <version>10</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -5136,14 +5380,6 @@
           <name>CCJLinkTCPIP</name>
           <state>aaa.bbb.ccc.ddd</state>
         </option>
-        <option>
-          <name>CCJLinkResetRadio</name>
-          <state>2</state>
-        </option>
-        <option>
-          <name>CCJLinkResetInitSeq</name>
-          <state>0</state>
-        </option>
         <option>
           <name>CCJLinkSpeedRadioV2</name>
           <state>2</state>
@@ -5201,6 +5437,15 @@
           <name>OCJLinkAttachSlave</name>
           <state>1</state>
         </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>0</version>
+          <state>5</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -5232,7 +5477,7 @@
       <name>MACRAIGOR_ID</name>
       <archiveVersion>2</archiveVersion>
       <data>
-        <version>2</version>
+        <version>3</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -5307,6 +5552,14 @@
           <name>CCJTagUpdateBreakpoints</name>
           <state>main</state>
         </option>
+        <option>
+          <name>CCMacraigorInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMacraigorInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -5397,11 +5650,11 @@
     </settings>
     <debuggerPlugins>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -5417,7 +5670,11 @@
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ewplugin</file>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
       <plugin>
@@ -5436,6 +5693,12 @@
         <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
       </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
     </debuggerPlugins>
   </configuration>
 </project>
+
+
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp
index cf83975d93..439c355320 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp
@@ -4728,7 +4728,7 @@
         <option>
           <name>Variant</name>
           <version>8</version>
-          <state>0</state>
+          <state>11</state>
         </option>
         <option>
           <name>GEndianMode</name>
@@ -4750,7 +4750,7 @@
         </option>
         <option>
           <name>Output description</name>
-          <state>No specifier a, A, no specifier n, no float nor long long, no flags.</state>
+          <state>No specifier a, A, no specifier n, no float nor long long.</state>
         </option>
         <option>
           <name>GOutputBinary</name>
@@ -4789,7 +4789,7 @@
         </option>
         <option>
           <name>OGLastSavedByProductVersion</name>
-          <state>5.10.0.213</state>
+          <state>5.20.0.50986</state>
         </option>
         <option>
           <name>GeneralEnableMisra</name>
@@ -4877,7 +4877,7 @@
         </option>
         <option>
           <name>CCDiagSuppress</name>
-          <state>Pe826,Pe1375</state>
+          <state>Pa082</state>
         </option>
         <option>
           <name>CCDiagRemark</name>
@@ -4974,6 +4974,7 @@
           <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek</state>
           <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\peripherals</state>
           <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\components</state>
+          <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\utility</state>
           <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\usb</state>
           <state>$PROJ_DIR$\..\..\..\Source\include</state>
           <state>$PROJ_DIR$\..</state>
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.cspy.bat b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.cspy.bat
index 7069dbf22a..4784cbeee8 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.cspy.bat
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.cspy.bat
@@ -22,7 +22,7 @@
 @REM but they are listed at the end of this file for reference.
 
 
-"C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\bin\cspybat" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\armproc.dll" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\armjlink.dll"  %1 --plugin "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\<libsupport_plugin>" --macro "C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ewp\..\..\..\resources\at91sam9xe-ek-flash.mac" --backend -B "--endian=little" "--cpu=ARM926EJ-S" "--fpu=None" "-p" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\CONFIG\debugger\Atmel\ioAT91SAM9XE256.ddf" "--semihosting" "--device=AT91SAM9XE256" "-d" "jlink" "--drv_communication=USB0" "--jlink_speed=adaptive" "--drv_catch_exceptions=0x000" 
+"C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\bin\cspybat" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\armproc.dll" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\armjlink.dll"  %1 --plugin "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\<libsupport_plugin>" --macro "C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ewp\..\..\..\resources\at91sam9xe-ek-flash.mac" --backend -B "--endian=little" "--cpu=ARM926EJ-S" "--fpu=None" "-p" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\CONFIG\debugger\Atmel\ioAT91SAM9XE512.ddf" "--drv_verify_download" "--semihosting" "--device=AT91SAM9XE512" "-d" "jlink" "--drv_communication=USB0" "--jlink_speed=auto" "--jlink_initial_speed=32" "--drv_catch_exceptions=0x000" "--jlink_reset_strategy=50,0" 
 
 
 @REM Loaded plugins:
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt
index 33f4649c2f..22d6b995e1 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt
@@ -1,5 +1,214 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<Project/>
+<Project>
+  <Desktop>
+    <Static>
+      <Debug-Log/>
+      <Build>
+        <ColumnWidth0>20</ColumnWidth0>
+        <ColumnWidth1>1216</ColumnWidth1>
+        <ColumnWidth2>324</ColumnWidth2>
+        <ColumnWidth3>81</ColumnWidth3>
+      </Build>
+      <Workspace>
+        <ColumnWidths>
+          <Column0>124</Column0>
+          <Column1>27</Column1>
+          <Column2>27</Column2>
+          <Column3>27</Column3>
+        </ColumnWidths>
+      </Workspace>
+      <Disassembly>
+        <MixedMode>1</MixedMode>
+        <CodeCovShow>0</CodeCovShow>
+      </Disassembly>
+    </Static>
+    <Windows>
+      <Wnd3>
+        <Tabs>
+          <Tab>
+            <Identity>TabID-27883-8575</Identity>
+            <TabName>Debug Log</TabName>
+            <Factory>Debug-Log</Factory>
+            <Session/>
+          </Tab>
+          <Tab>
+            <Identity>TabID-24747-8634</Identity>
+            <TabName>Build</TabName>
+            <Factory>Build</Factory>
+            <Session/>
+          </Tab>
+        </Tabs>
+        <SelectedTab>0</SelectedTab>
+      </Wnd3>
+      <Wnd4>
+        <Tabs>
+          <Tab>
+            <Identity>TabID-5864-8578</Identity>
+            <TabName>Workspace</TabName>
+            <Factory>Workspace</Factory>
+            <Session>
+              <NodeDict>
+                <ExpandedNode>at91sam9xe-ek</ExpandedNode>
+              </NodeDict>
+            </Session>
+          </Tab>
+        </Tabs>
+        <SelectedTab>0</SelectedTab>
+      </Wnd4>
+      <Wnd5>
+        <Tabs>
+          <Tab>
+            <Identity>TabID-16612-8582</Identity>
+            <TabName>Disassembly</TabName>
+            <Factory>Disassembly</Factory>
+            <Session/>
+          </Tab>
+        </Tabs>
+        <SelectedTab>0</SelectedTab>
+      </Wnd5>
+    </Windows>
+    <Editor>
+      <Pane>
+        <Tab>
+          <Factory>TextEditor</Factory>
+          <Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_cstartup_iar.s</Filename>
+          <XPos>0</XPos>
+          <YPos>125</YPos>
+          <SelStart>4609</SelStart>
+          <SelEnd>4609</SelEnd>
+        </Tab>
+        <Tab>
+          <Factory>TextEditor</Factory>
+          <Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\port.c</Filename>
+          <XPos>0</XPos>
+          <YPos>178</YPos>
+          <SelStart>7138</SelStart>
+          <SelEnd>7138</SelEnd>
+        </Tab>
+        <Tab>
+          <Factory>TextEditor</Factory>
+          <Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\portasm.s79</Filename>
+          <XPos>0</XPos>
+          <YPos>17</YPos>
+          <SelStart>1072</SelStart>
+          <SelEnd>1072</SelEnd>
+        </Tab>
+        <Tab>
+          <Factory>TextEditor</Factory>
+          <Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ParTest\ParTest.c</Filename>
+          <XPos>0</XPos>
+          <YPos>58</YPos>
+          <SelStart>2678</SelStart>
+          <SelEnd>2701</SelEnd>
+        </Tab>
+        <ActiveTab>3</ActiveTab>
+        <Tab>
+          <Factory>TextEditor</Factory>
+          <Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\utility\led.c</Filename>
+          <XPos>0</XPos>
+          <YPos>92</YPos>
+          <SelStart>2663</SelStart>
+          <SelEnd>2663</SelEnd>
+        </Tab>
+      </Pane>
+      <ActivePane>0</ActivePane>
+      <Sizes>
+        <Pane>
+          <X>1000000</X>
+          <Y>1000000</Y>
+        </Pane>
+      </Sizes>
+      <SplitMode>1</SplitMode>
+    </Editor>
+    <Positions>
+      <Top>
+        <Row0>
+          <Sizes>
+            <Toolbar-00aa9b70>
+              <key>iaridepm.enu1</key>
+            </Toolbar-00aa9b70>
+          </Sizes>
+        </Row0>
+        <Row1>
+          <Sizes>
+            <Toolbar-044a32e0>
+              <key>debuggergui.enu1</key>
+            </Toolbar-044a32e0>
+          </Sizes>
+        </Row1>
+      </Top>
+      <Left>
+        <Row0>
+          <Sizes>
+            <Wnd4>
+              <Rect>
+                <Top>-2</Top>
+                <Left>-2</Left>
+                <Bottom>716</Bottom>
+                <Right>198</Right>
+                <x>-2</x>
+                <y>-2</y>
+                <xscreen>200</xscreen>
+                <yscreen>200</yscreen>
+                <sizeHorzCX>119048</sizeHorzCX>
+                <sizeHorzCY>203666</sizeHorzCY>
+                <sizeVertCX>119048</sizeVertCX>
+                <sizeVertCY>731161</sizeVertCY>
+              </Rect>
+            </Wnd4>
+          </Sizes>
+        </Row0>
+      </Left>
+      <Right>
+        <Row0>
+          <Sizes>
+            <Wnd5>
+              <Rect>
+                <Top>-2</Top>
+                <Left>-2</Left>
+                <Bottom>716</Bottom>
+                <Right>198</Right>
+                <x>-2</x>
+                <y>-2</y>
+                <xscreen>200</xscreen>
+                <yscreen>200</yscreen>
+                <sizeHorzCX>119048</sizeHorzCX>
+                <sizeHorzCY>203666</sizeHorzCY>
+                <sizeVertCX>119048</sizeVertCX>
+                <sizeVertCY>731161</sizeVertCY>
+              </Rect>
+            </Wnd5>
+          </Sizes>
+        </Row0>
+      </Right>
+      <Bottom>
+        <Row0>
+          <Sizes>
+            <Wnd3>
+              <Rect>
+                <Top>-2</Top>
+                <Left>-2</Left>
+                <Bottom>198</Bottom>
+                <Right>1682</Right>
+                <x>-2</x>
+                <y>-2</y>
+                <xscreen>1684</xscreen>
+                <yscreen>200</yscreen>
+                <sizeHorzCX>1002381</sizeHorzCX>
+                <sizeHorzCY>203666</sizeHorzCY>
+                <sizeVertCX>119048</sizeVertCX>
+                <sizeVertCY>203666</sizeVertCY>
+              </Rect>
+            </Wnd3>
+          </Sizes>
+        </Row0>
+      </Bottom>
+      <Float>
+        <Sizes/>
+      </Float>
+    </Positions>
+  </Desktop>
+</Project>
 
 
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni
index eead5182b3..fadd9a7871 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni
@@ -2,6 +2,28 @@
 WatchCond=_ 0
 Watch0=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0
 Watch1=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0
+[DisAssemblyWindow]
+NumStates=_ 1
+State 1=_ 1
+[CodeCoverage]
+Enabled=_ 0
+[StackPlugin]
+Enabled=1
+OverflowWarningsEnabled=1
+WarningThreshold=90
+SpWarningsEnabled=1
+WarnHow=0
+UseTrigger=1
+TriggerName=main
+LimitSize=0
+ByteLimit=50
+[Log file]
+LoggingEnabled=_ 0
+LogFile=_ ""
+Category=_ 0
+[TermIOLog]
+LoggingEnabled=_ 0
+LogFile=_ ""
 [Disassemble mode]
 mode=0
 [Breakpoints]
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/main.c b/Demo/ARM9_AT91SAM9XE_IAR/main.c
index 5deb34fce4..c2e71ec241 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/main.c
+++ b/Demo/ARM9_AT91SAM9XE_IAR/main.c
@@ -96,6 +96,10 @@ int main()
 	prvSetupHardware();
 	
 	/* Start the standard demo tasks. */
+	vStartLEDFlashTasks( mainLED_TASK_PRIORITY );	
+
+	/* These tasks to be added once the simple flasher is running.
+	
 	vStartIntegerMathTasks( tskIDLE_PRIORITY );
 	vStartLEDFlashTasks( mainLED_TASK_PRIORITY );
 	vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
@@ -108,9 +112,9 @@ int main()
 	vStartQueuePeekTasks();
 	vStartRecursiveMutexTasks();
 	
-	/* The death demo tasks must be started last as the sanity checks performed
-	require knowledge of the number of other tasks in the system. */
-	vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY );
+	The death demo tasks must be started last as the sanity checks performed
+	require knowledge of the number of other tasks in the system.
+	vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY ); */
 	
 	/* Start the scheduler.  From this point on the execution will be under
 	the control of the kernel. */
@@ -125,7 +129,7 @@ int main()
 static void prvCheckTask( void * pvParameters )
 {
 portTickType xNextWakeTime, xPeriod = mainNO_ERROR_PERIOD;
-static volatile ulErrorCode = 0UL;
+static volatile unsigned portLONG ulErrorCode = 0UL;
 
 	/* Initialise xNextWakeTime prior to its first use.  From this point on
 	the value of the variable is handled automatically by the kernel. */
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt b/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt
index 1be3abe1a6..c4c8326479 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt
+++ b/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt
@@ -3,7 +3,7 @@
 <Workspace>
   <ConfigDictionary>
     
-  <CurrentConfigs><Project>at91sam9xe-ek/at91sam9xe256_flash</Project></CurrentConfigs></ConfigDictionary>
+  <CurrentConfigs><Project>at91sam9xe-ek/at91sam9xe512_flash</Project></CurrentConfigs></ConfigDictionary>
   <Desktop>
     <Static>
       <Workspace>
@@ -12,7 +12,7 @@
           
           
           
-        <Column0>330</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
+        <Column0>258</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
       </Workspace>
       <Build>
         
@@ -20,11 +20,11 @@
         
         
       <ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1216</ColumnWidth1><ColumnWidth2>324</ColumnWidth2><ColumnWidth3>81</ColumnWidth3></Build>
-    </Static>
+    <Debug-Log/><TerminalIO/></Static>
     <Windows>
       
       
-    <Wnd2>
+    <Wnd0>
         <Tabs>
           <Tab>
             <Identity>TabID-26777-6465</Identity>
@@ -36,7 +36,7 @@
           </Tab>
         </Tabs>
         
-      <SelectedTab>0</SelectedTab></Wnd2><Wnd3>
+      <SelectedTab>0</SelectedTab></Wnd0><Wnd1>
         <Tabs>
           <Tab>
             <Identity>TabID-25209-6494</Identity>
@@ -44,22 +44,22 @@
             <Factory>Build</Factory>
             <Session/>
           </Tab>
-        </Tabs>
+        <Tab><Identity>TabID-21317-8493</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs>
         
-      <SelectedTab>0</SelectedTab></Wnd3></Windows>
+      <SelectedTab>0</SelectedTab></Wnd1></Windows>
     <Editor>
       
       
       
       
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_cstartup_iar.s</Filename><XPos>0</XPos><YPos>125</YPos><SelStart>4609</SelStart><SelEnd>4609</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\port.c</Filename><XPos>0</XPos><YPos>178</YPos><SelStart>7138</SelStart><SelEnd>7138</SelEnd></Tab><ActiveTab>1</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\portasm.s79</Filename><XPos>0</XPos><YPos>17</YPos><SelStart>1072</SelStart><SelEnd>1072</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
+    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
     <Positions>
       
       
       
       
       
-    <Top><Row0><Sizes><Toolbar-00aa98f0><key>iaridepm.enu1</key></Toolbar-00aa98f0></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>404</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>241667</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
+    <Top><Row0><Sizes><Toolbar-00aa9b88><key>iaridepm.enu1</key></Toolbar-00aa9b88></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>592</Bottom><Right>332</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>238571</sizeVertCX><sizeVertCY>604888</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>346</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>348</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>354379</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
   </Desktop>
 </Workspace>