diff --git a/Demo/msp430_IAR/RTOSDemo.ewd b/Demo/msp430_IAR/RTOSDemo.ewd
index 74cb62d9a..0fe98c6ec 100644
--- a/Demo/msp430_IAR/RTOSDemo.ewd
+++ b/Demo/msp430_IAR/RTOSDemo.ewd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <project>
-  <fileVersion>1</fileVersion>
+  <fileVersion>2</fileVersion>
   <configuration>
     <name>Debug</name>
     <toolchain>
@@ -12,7 +12,7 @@
       <name>C-SPY</name>
       <archiveVersion>4</archiveVersion>
       <data>
-        <version>20</version>
+        <version>21</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -75,13 +75,17 @@
           <name>ProcMSP430X</name>
           <state>1</state>
         </option>
+        <option>
+          <name>CompilerDataModel</name>
+          <state>1</state>
+        </option>
       </data>
     </settings>
     <settings>
       <name>430FET</name>
       <archiveVersion>1</archiveVersion>
       <data>
-        <version>11</version>
+        <version>14</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -108,10 +112,6 @@
           <name>EraseOptionSlaveP7</name>
           <state>0</state>
         </option>
-        <option>
-          <name>VirtualBreakpointP7</name>
-          <state>0</state>
-        </option>
         <option>
           <name>ExitBreakpointP7</name>
           <state>0</state>
@@ -133,10 +133,6 @@
           <version>0</version>
           <state>0</state>
         </option>
-        <option>
-          <name>ConnectioonP7</name>
-          <state>0</state>
-        </option>
         <option>
           <name>TargetVoltage</name>
           <state>3.0</state>
@@ -177,6 +173,31 @@
           <name>NeedLockedFlashAccess</name>
           <state>1</state>
         </option>
+        <option>
+          <name>UsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>FetConnection</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>SoftwareBreakpointEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RadioSoftwareBreakpointType</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AllowAccessToBSL</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -205,6 +226,10 @@
         <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.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>
         <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
@@ -221,6 +246,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>
@@ -233,7 +262,7 @@
       <name>C-SPY</name>
       <archiveVersion>4</archiveVersion>
       <data>
-        <version>20</version>
+        <version>21</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>0</debug>
         <option>
@@ -296,13 +325,17 @@
           <name>ProcMSP430X</name>
           <state>1</state>
         </option>
+        <option>
+          <name>CompilerDataModel</name>
+          <state>1</state>
+        </option>
       </data>
     </settings>
     <settings>
       <name>430FET</name>
       <archiveVersion>1</archiveVersion>
       <data>
-        <version>11</version>
+        <version>14</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>0</debug>
         <option>
@@ -329,10 +362,6 @@
           <name>EraseOptionSlaveP7</name>
           <state>0</state>
         </option>
-        <option>
-          <name>VirtualBreakpointP7</name>
-          <state>0</state>
-        </option>
         <option>
           <name>ExitBreakpointP7</name>
           <state>0</state>
@@ -354,10 +383,6 @@
           <version>0</version>
           <state>0</state>
         </option>
-        <option>
-          <name>ConnectioonP7</name>
-          <state>0</state>
-        </option>
         <option>
           <name>TargetVoltage</name>
           <state>3.0</state>
@@ -398,6 +423,31 @@
           <name>NeedLockedFlashAccess</name>
           <state>1</state>
         </option>
+        <option>
+          <name>UsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>FetConnection</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>SoftwareBreakpointEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RadioSoftwareBreakpointType</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AllowAccessToBSL</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -426,6 +476,10 @@
         <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.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>
         <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
@@ -442,6 +496,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>
 </project>
diff --git a/Demo/msp430_IAR/RTOSDemo.ewp b/Demo/msp430_IAR/RTOSDemo.ewp
index 42dd2365a..fa0b73e06 100644
--- a/Demo/msp430_IAR/RTOSDemo.ewp
+++ b/Demo/msp430_IAR/RTOSDemo.ewp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <project>
-  <fileVersion>1</fileVersion>
+  <fileVersion>2</fileVersion>
   <configuration>
     <name>Debug</name>
     <toolchain>
@@ -10,9 +10,9 @@
     <debug>1</debug>
     <settings>
       <name>General</name>
-      <archiveVersion>5</archiveVersion>
+      <archiveVersion>7</archiveVersion>
       <data>
-        <version>21</version>
+        <version>24</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -86,24 +86,11 @@
           <name>Output description</name>
           <state>No specifier a or A, no specifier n, no float or long long, no flags.</state>
         </option>
-        <option>
-          <name>GHeapSize</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>GStackSize</name>
-          <state>80</state>
-        </option>
         <option>
           <name>GRuntimeLibSelectSlave</name>
           <version>0</version>
           <state>1</state>
         </option>
-        <option>
-          <name>GeneralMisraRules</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
         <option>
           <name>GeneralEnableMisra</name>
           <state>0</state>
@@ -116,13 +103,38 @@
           <name>OGChipSelectMenu</name>
           <state>MSP430F449	MSP430F449</state>
         </option>
+        <option>
+          <name>GStackHeapOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GStackSize2</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>GHeapSize2</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>RadioDataModelType</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GHeap20Size</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
       </data>
     </settings>
     <settings>
       <name>ICC430</name>
       <archiveVersion>4</archiveVersion>
       <data>
-        <version>24</version>
+        <version>27</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -189,15 +201,6 @@
           <name>CCRequirePrototypes</name>
           <state>0</state>
         </option>
-        <option>
-          <name>CCOptSizeSpeed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptimization</name>
-          <version>2</version>
-          <state>2</state>
-        </option>
         <option>
           <name>CCAllowList</name>
           <version>1</version>
@@ -267,15 +270,6 @@
           <name>CCLibConfigHeader</name>
           <state>1</state>
         </option>
-        <option>
-          <name>CCOptSizeSpeedSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptimizationSlave</name>
-          <version>2</version>
-          <state>2</state>
-        </option>
         <option>
           <name>CPIC</name>
           <state>1</state>
@@ -319,11 +313,6 @@
           <state>$TOOLKIT_DIR$\INC\</state>
           <state>$TOOLKIT_DIR$\INC\DLIB\</state>
         </option>
-        <option>
-          <name>CompilerMisraRules</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
         <option>
           <name>CompilerMisraOverride</name>
           <state>0</state>
@@ -340,13 +329,39 @@
           <name>Save20bit</name>
           <state>0</state>
         </option>
+        <option>
+          <name>CompilerDataModel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
       </data>
     </settings>
     <settings>
       <name>A430</name>
       <archiveVersion>4</archiveVersion>
       <data>
-        <version>12</version>
+        <version>13</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -450,12 +465,6 @@
           <name>AXRefDual</name>
           <state>0</state>
         </option>
-        <option>
-          <name>AIncludes</name>
-          <state>$TOOLKIT_DIR$\INC\</state>
-          <state>$PROJ_DIR$</state>
-          <state>$PROJ_DIR$\..\..\Source\include</state>
-        </option>
         <option>
           <name>ADebug</name>
           <state>1</state>
@@ -480,10 +489,6 @@
           <name>OutputFile</name>
           <state>$FILE_BNAME$.r43</state>
         </option>
-        <option>
-          <name>IncExterns</name>
-          <state>0</state>
-        </option>
         <option>
           <name>AMultibyteSupport</name>
           <state>0</state>
@@ -496,22 +501,23 @@
           <name>AExtraOptions</name>
           <state></state>
         </option>
-        <option>
-          <name>AOverrideModuleTypeDefault</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ARadioModuleType</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ARadioModuleTypeSlave</name>
-          <state>1</state>
-        </option>
         <option>
           <name>OA1M</name>
           <state>1</state>
         </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AStdIncludes</name>
+          <state>$TOOLKIT_DIR$\INC\</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state>$PROJ_DIR$</state>
+          <state>$PROJ_DIR$\..\..\Source\include</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -539,7 +545,7 @@
       <name>XLINK</name>
       <archiveVersion>4</archiveVersion>
       <data>
-        <version>21</version>
+        <version>22</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -557,7 +563,7 @@
         </option>
         <option>
           <name>FormatVariant</name>
-          <version>7</version>
+          <version>8</version>
           <state>2</state>
         </option>
         <option>
@@ -751,7 +757,7 @@
         </option>
         <option>
           <name>ExtraFormatVariant</name>
-          <version>7</version>
+          <version>8</version>
           <state>2</state>
         </option>
         <option>
@@ -810,6 +816,10 @@
           <name>CrcInitialValue</name>
           <state>0x0</state>
         </option>
+        <option>
+          <name>XLibraryHeap20</name>
+          <state>1</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -847,9 +857,9 @@
     <debug>0</debug>
     <settings>
       <name>General</name>
-      <archiveVersion>5</archiveVersion>
+      <archiveVersion>7</archiveVersion>
       <data>
-        <version>21</version>
+        <version>24</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>0</debug>
         <option>
@@ -923,24 +933,11 @@
           <name>Output description</name>
           <state>Full formatting.</state>
         </option>
-        <option>
-          <name>GHeapSize</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>GStackSize</name>
-          <state>80</state>
-        </option>
         <option>
           <name>GRuntimeLibSelectSlave</name>
           <version>0</version>
           <state>4</state>
         </option>
-        <option>
-          <name>GeneralMisraRules</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
         <option>
           <name>GeneralEnableMisra</name>
           <state>0</state>
@@ -953,13 +950,38 @@
           <name>OGChipSelectMenu</name>
           <state>MSP430F149	MSP430F149</state>
         </option>
+        <option>
+          <name>GStackHeapOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GStackSize2</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>GHeapSize2</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>RadioDataModelType</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GHeap20Size</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
       </data>
     </settings>
     <settings>
       <name>ICC430</name>
       <archiveVersion>4</archiveVersion>
       <data>
-        <version>24</version>
+        <version>27</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>0</debug>
         <option>
@@ -1026,15 +1048,6 @@
           <name>CCRequirePrototypes</name>
           <state>0</state>
         </option>
-        <option>
-          <name>CCOptSizeSpeed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptimization</name>
-          <version>2</version>
-          <state>4</state>
-        </option>
         <option>
           <name>CCAllowList</name>
           <version>1</version>
@@ -1104,15 +1117,6 @@
           <name>CCLibConfigHeader</name>
           <state>1</state>
         </option>
-        <option>
-          <name>CCOptSizeSpeedSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptimizationSlave</name>
-          <version>2</version>
-          <state>4</state>
-        </option>
         <option>
           <name>CPIC</name>
           <state>1</state>
@@ -1153,11 +1157,6 @@
           <name>CCStdIncludePaths</name>
           <state>###Uninitialized###</state>
         </option>
-        <option>
-          <name>CompilerMisraRules</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
         <option>
           <name>CompilerMisraOverride</name>
           <state>0</state>
@@ -1174,13 +1173,39 @@
           <name>Save20bit</name>
           <state>0</state>
         </option>
+        <option>
+          <name>CompilerDataModel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
       </data>
     </settings>
     <settings>
       <name>A430</name>
       <archiveVersion>4</archiveVersion>
       <data>
-        <version>12</version>
+        <version>13</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>0</debug>
         <option>
@@ -1284,10 +1309,6 @@
           <name>AXRefDual</name>
           <state>0</state>
         </option>
-        <option>
-          <name>AIncludes</name>
-          <state>###Uninitialized###</state>
-        </option>
         <option>
           <name>ADebug</name>
           <state>0</state>
@@ -1312,10 +1333,6 @@
           <name>OutputFile</name>
           <state></state>
         </option>
-        <option>
-          <name>IncExterns</name>
-          <state>0</state>
-        </option>
         <option>
           <name>AMultibyteSupport</name>
           <state>0</state>
@@ -1328,22 +1345,22 @@
           <name>AExtraOptions</name>
           <state></state>
         </option>
-        <option>
-          <name>AOverrideModuleTypeDefault</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ARadioModuleType</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ARadioModuleTypeSlave</name>
-          <state>1</state>
-        </option>
         <option>
           <name>OA1M</name>
           <state>1</state>
         </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AStdIncludes</name>
+          <state>$TOOLKIT_DIR$\INC\</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -1371,7 +1388,7 @@
       <name>XLINK</name>
       <archiveVersion>4</archiveVersion>
       <data>
-        <version>21</version>
+        <version>22</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>0</debug>
         <option>
@@ -1389,7 +1406,7 @@
         </option>
         <option>
           <name>FormatVariant</name>
-          <version>7</version>
+          <version>8</version>
           <state>2</state>
         </option>
         <option>
@@ -1583,7 +1600,7 @@
         </option>
         <option>
           <name>ExtraFormatVariant</name>
-          <version>7</version>
+          <version>8</version>
           <state>2</state>
         </option>
         <option>
@@ -1642,6 +1659,10 @@
           <name>CrcInitialValue</name>
           <state>0x0</state>
         </option>
+        <option>
+          <name>XLibraryHeap20</name>
+          <state>1</state>
+        </option>
       </data>
     </settings>
     <settings>
diff --git a/Demo/msp430_IAR/settings/RTOSDemo.cspy.bat b/Demo/msp430_IAR/settings/RTOSDemo.cspy.bat
index 5b8ce13a1..48faa16c5 100644
--- a/Demo/msp430_IAR/settings/RTOSDemo.cspy.bat
+++ b/Demo/msp430_IAR/settings/RTOSDemo.cspy.bat
@@ -22,12 +22,13 @@
 @REM but they are listed at the end of this file for reference.
 
 
-"C:\Devtools\IAR Systems\Embedded Workbench 4.0\common\bin\cspybat" "C:\Devtools\IAR Systems\Embedded Workbench 4.0\430\bin\430proc.dll" "C:\Devtools\IAR Systems\Embedded Workbench 4.0\430\bin\430fet.dll"  %1 --plugin "C:\Devtools\IAR Systems\Embedded Workbench 4.0\430\bin\<libsupport_plugin>" --backend -B "-p" "C:\Devtools\IAR Systems\Embedded Workbench 4.0\430\config\MSP430F449.ddf" "-d" "fet" "--verify_all" "--erase_main_and_info" "--derivative" "MSP430F449" "-lpt1" "--connection" "parallel_port" "--allow_locked_flash_access" "--protocol" "4wire" "--eem" "EMEX_HIGH" 
+"C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\bin\cspybat" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\430\bin\430proc.dll" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\430\bin\430fet.dll"  %1 --plugin "C:\Devtools\IAR Systems\Embedded Workbench 5.0\430\bin\<libsupport_plugin>" --backend -B "-p" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\430\config\MSP430F449.ddf" "-d" "fet" "--verify_all" "--erase_main_and_info" "--derivative" "MSP430F449" "-lpt1" "--allow_locked_flash_access" "--protocol" "4wire" "--eem" "EMEX_HIGH" "--connection" "ti_lpt" 
 
 
 @REM Loaded plugins:
 @REM    430libsupport.dll
-@REM    C:\Devtools\IAR Systems\Embedded Workbench 4.0\430\plugins\lcd\lcd.dll
-@REM    C:\Devtools\IAR Systems\Embedded Workbench 4.0\common\plugins\CodeCoverage\CodeCoverage.dll
-@REM    C:\Devtools\IAR Systems\Embedded Workbench 4.0\common\plugins\Profiling\Profiling.dll
-@REM    C:\Devtools\IAR Systems\Embedded Workbench 4.0\common\plugins\stack\stack.dll
+@REM    C:\Devtools\IAR Systems\Embedded Workbench 5.0\430\plugins\lcd\lcd.dll
+@REM    C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\plugins\CodeCoverage\CodeCoverage.dll
+@REM    C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\plugins\Profiling\Profiling.dll
+@REM    C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\plugins\stack\stack.dll
+@REM    C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\plugins\SymList\SymList.dll
diff --git a/Demo/msp430_IAR/settings/RTOSDemo.dbgdt b/Demo/msp430_IAR/settings/RTOSDemo.dbgdt
index ec3756ae2..b28708d83 100644
--- a/Demo/msp430_IAR/settings/RTOSDemo.dbgdt
+++ b/Demo/msp430_IAR/settings/RTOSDemo.dbgdt
@@ -28,7 +28,7 @@
       
       
       
-    <Wnd3>
+    <Wnd0>
         <Tabs>
           <Tab>
             <Identity>TabID-22310-31641</Identity>
@@ -44,7 +44,7 @@
           </Tab>
         <Tab><Identity>TabID-3522-7304</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs>
         
-      <SelectedTab>0</SelectedTab></Wnd3><Wnd4>
+      <SelectedTab>0</SelectedTab></Wnd0><Wnd1>
         <Tabs>
           <Tab>
             <Identity>TabID-290-31644</Identity>
@@ -56,20 +56,20 @@
           </Tab>
         </Tabs>
         
-      <SelectedTab>0</SelectedTab></Wnd4><Wnd5><Tabs><Tab><Identity>TabID-452-589</Identity><TabName>Disassembly</TabName><Factory>Disassembly</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd5></Windows>
+      <SelectedTab>0</SelectedTab></Wnd1></Windows>
     <Editor>
       
       
       
       
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\msp430_IAR\main.c</Filename><XPos>0</XPos><YPos>142</YPos><SelStart>6347</SelStart><SelEnd>6347</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\msp430_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>72</YPos><SelStart>4168</SelStart><SelEnd>4168</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\msp430_IAR\serial\serialASM.s43</Filename><XPos>0</XPos><YPos>57</YPos><SelStart>3209</SelStart><SelEnd>3209</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\IAR\MSP430\portext.s43</Filename><XPos>0</XPos><YPos>54</YPos><SelStart>2743</SelStart><SelEnd>2743</SelEnd></Tab><ActiveTab>3</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\msp430_IAR\serial\serial.c</Filename><XPos>0</XPos><YPos>271</YPos><SelStart>9596</SelStart><SelEnd>9596</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Source\tasks.c</Filename><XPos>0</XPos><YPos>971</YPos><SelStart>32358</SelStart><SelEnd>32358</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\WorkingCopy2\Demo\msp430_IAR\main.c</Filename><XPos>0</XPos><YPos>94</YPos><SelStart>6347</SelStart><SelEnd>6347</SelEnd></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Source\tasks.c</Filename><XPos>0</XPos><YPos>790</YPos><SelStart>27298</SelStart><SelEnd>27310</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-0088f570><key>iaridepm.enu1</key></Toolbar-0088f570><Toolbar-01b3c388><key>debuggergui.enu1</key></Toolbar-01b3c388></Sizes></Row0><Row1><Sizes><Toolbar-019e7308><key>430fet1</key></Toolbar-019e7308></Sizes></Row1><Row2><Sizes/></Row2><Row3><Sizes/></Row3></Top><Left><Row0><Sizes><Wnd4><Rect><Top>-2</Top><Left>-2</Left><Bottom>644</Bottom><Right>378</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>271429</sizeVertCX><sizeVertCY>657841</sizeVertCY></Rect></Wnd4></Sizes></Row0></Left><Right><Row0><Sizes><Wnd5><Rect><Top>-2</Top><Left>-2</Left><Bottom>644</Bottom><Right>198</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>657841</sizeVertCY></Rect></Wnd5></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>270</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>272</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>276986</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
+    <Top><Row0><Sizes><Toolbar-0088f570><key>iaridepm.enu1</key></Toolbar-0088f570><Toolbar-01b6a7a8><key>debuggergui.enu1</key></Toolbar-01b6a7a8></Sizes></Row0><Row1><Sizes><Toolbar-01b6a668><key>430fet1</key></Toolbar-01b6a668></Sizes></Row1></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>644</Bottom><Right>378</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>271429</sizeVertCX><sizeVertCY>657841</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>270</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>272</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>276986</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
   </Desktop>
 </Project>
 
diff --git a/Demo/msp430_IAR/settings/RTOSDemo.dni b/Demo/msp430_IAR/settings/RTOSDemo.dni
index 9c9543d84..4fb0096e7 100644
--- a/Demo/msp430_IAR/settings/RTOSDemo.dni
+++ b/Demo/msp430_IAR/settings/RTOSDemo.dni
@@ -17,7 +17,7 @@ Control Register=0
 NextState0=0
 NextState1=0
 [Action Register]
-Break=5
+Break=3
 State Storage=0
 [DisAssemblyWindow]
 NumStates=_ 1
diff --git a/Demo/msp430_IAR/settings/RTOSDemo.wsdt b/Demo/msp430_IAR/settings/RTOSDemo.wsdt
index 35237de94..19323e09f 100644
--- a/Demo/msp430_IAR/settings/RTOSDemo.wsdt
+++ b/Demo/msp430_IAR/settings/RTOSDemo.wsdt
@@ -12,7 +12,7 @@
           
           
           
-        <Column0>274</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
+        <Column0>344</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
       </Workspace>
       <Build>
         
@@ -52,14 +52,14 @@
       
       
       
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\msp430_IAR\main.c</Filename><XPos>0</XPos><YPos>142</YPos><SelStart>6346</SelStart><SelEnd>6346</SelEnd></Tab><ActiveTab>0</ActiveTab></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\WorkingCopy2\Demo\msp430_IAR\main.c</Filename><XPos>0</XPos><YPos>145</YPos><SelStart>6347</SelStart><SelEnd>6347</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-0088f570><key>iaridepm.enu1</key></Toolbar-0088f570></Sizes></Row0><Row1><Sizes/></Row1><Row2><Sizes/></Row2><Row3><Sizes/></Row3><Row4><Sizes/></Row4></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>679</Bottom><Right>348</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>250000</sizeVertCX><sizeVertCY>693483</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>259</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>261</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>265784</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
+    <Top><Row0><Sizes><Toolbar-00aa9ba0><key>iaridepm.enu1</key></Toolbar-00aa9ba0></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>679</Bottom><Right>418</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>250000</sizeVertCX><sizeVertCY>693483</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>259</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>261</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>265784</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
   </Desktop>
 </Workspace>