diff --git a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/properties.index b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/properties.index
index d5cd77dd52..a54d3bdbd1 100644
Binary files a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/properties.index and b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/properties.index differ
diff --git a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.markers b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.markers
index 0901dab9b3..5f2f6784f1 100644
Binary files a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.markers and b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.markers differ
diff --git a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
index c3c633aabc..8a0e697483 100644
Binary files a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index and b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index differ
diff --git a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
index 83c0fc5ecd..a808be886f 100644
Binary files a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ
diff --git a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.managedbuilder.core.prefs
index 5244cfb4d4..a608f4a57a 100644
--- a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.managedbuilder.core.prefs
+++ b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.managedbuilder.core.prefs
@@ -1,3 +1,3 @@
-#Thu May 28 12:28:43 BST 2009
-properties/RTOSDemo.null.1399204152/com.crt.advproject.toolchain.exe.debug.2098365516=\#\r\n\#Thu May 28 12\:28\:43 BST 2009\r\ncom.crt.advproject.link.cpp.exe.debug.2062658134\=\\\#\\r\\n\\\#Thu May 28 12\\\:28\\\:43 BST 2009\\r\\nrebuildState\\\=false\\r\\n\r\ncom.crt.advproject.gas.exe.debug.1140174366\=\\\#\\r\\n\\\#Thu May 28 12\\\:28\\\:43 BST 2009\\r\\nrebuildState\\\=false\\r\\n\r\ncom.crt.advproject.gcc.exe.debug.1597927690\=\\\#\\r\\n\\\#Thu May 28 12\\\:28\\\:43 BST 2009\\r\\nrebuildState\\\=false\\r\\n\r\ncom.crt.advproject.toolchain.exe.debug.2098365516\=\\\#\\r\\n\\\#Thu May 28 12\\\:28\\\:43 BST 2009\\r\\nrcState\\\=0\\r\\nrebuildState\\\=false\\r\\n\r\ncom.crt.advproject.cpp.exe.debug.687684684\=\\\#\\r\\n\\\#Thu May 28 12\\\:28\\\:43 BST 2009\\r\\nrebuildState\\\=false\\r\\n\r\ncom.crt.advproject.link.exe.debug.964550531\=\\\#\\r\\n\\\#Thu May 28 12\\\:28\\\:43 BST 2009\\r\\nrebuildState\\\=false\\r\\n\r\ncom.crt.advproject.toolchain.exe.debug.1041945523\=\\\#\\r\\n\\\#Thu May 28 12\\\:28\\\:43 BST 2009\\r\\nrebuildState\\\=false\\r\\n\r\n
+#Thu May 28 13:11:41 BST 2009
+properties/RTOSDemo.null.1399204152/com.crt.advproject.toolchain.exe.debug.2098365516=\#\r\n\#Thu May 28 13\:11\:41 BST 2009\r\ncom.crt.advproject.link.cpp.exe.debug.2062658134\=\\\#\\r\\n\\\#Thu May 28 13\\\:11\\\:41 BST 2009\\r\\nrebuildState\\\=false\\r\\n\r\ncom.crt.advproject.gas.exe.debug.1140174366\=\\\#\\r\\n\\\#Thu May 28 13\\\:11\\\:41 BST 2009\\r\\nrebuildState\\\=false\\r\\n\r\ncom.crt.advproject.gcc.exe.debug.1597927690\=\\\#\\r\\n\\\#Thu May 28 13\\\:11\\\:41 BST 2009\\r\\nrebuildState\\\=false\\r\\n\r\ncom.crt.advproject.toolchain.exe.debug.2098365516\=\\\#\\r\\n\\\#Thu May 28 13\\\:11\\\:41 BST 2009\\r\\nrcState\\\=0\\r\\nrebuildState\\\=false\\r\\n\r\ncom.crt.advproject.cpp.exe.debug.687684684\=\\\#\\r\\n\\\#Thu May 28 13\\\:11\\\:41 BST 2009\\r\\nrebuildState\\\=false\\r\\n\r\ncom.crt.advproject.link.exe.debug.964550531\=\\\#\\r\\n\\\#Thu May 28 13\\\:11\\\:41 BST 2009\\r\\nrebuildState\\\=false\\r\\n\r\ncom.crt.advproject.toolchain.exe.debug.1041945523\=\\\#\\r\\n\\\#Thu May 28 13\\\:11\\\:41 BST 2009\\r\\nrebuildState\\\=false\\r\\n\r\n
 eclipse.preferences.version=1
diff --git a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
index bb9ddf9684..d3e74c842f 100644
--- a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
+++ b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
@@ -1,4 +1,4 @@
-#Thu May 28 12:42:16 BST 2009
+#Thu May 28 13:11:25 BST 2009
 eclipse.preferences.version=1
 tipsAndTricks=true
-platformState=1243510925814
+platformState=1243512673357
diff --git a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
index eac6bd1886..8b77d1ea2c 100644
--- a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
+++ b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
@@ -4,10 +4,10 @@
 		<item value="821" key="DIALOG_WIDTH"/>
 		<item value="89" key="DIALOG_Y_ORIGIN"/>
 		<item value=", com.crt.ctrlcenter.idleNative2, " key="org.eclipse.debug.ui.EXPANDED_NODES"/>
-		<item value="444" key="DIALOG_X_ORIGIN"/>
 		<item value="725" key="DIALOG_HEIGHT"/>
+		<item value="444" key="DIALOG_X_ORIGIN"/>
 		<item value="237" key="org.eclipse.debug.ui.DIALOG_SASH_WEIGHTS_1"/>
-		<item value="762" key="org.eclipse.debug.ui.DIALOG_SASH_WEIGHTS_2"/>
 		<item value="1|Tahoma|8.25|0|WINDOWS|1|-11|0|0|0|400|0|0|0|1|0|0|0|0|Tahoma" key="DIALOG_FONT_NAME"/>
+		<item value="762" key="org.eclipse.debug.ui.DIALOG_SASH_WEIGHTS_2"/>
 	</section>
 </section>
diff --git a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
index 430e86d92f..f196620ac0 100644
--- a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
+++ b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section name="Workbench">
 	<list key="installedFeatures">
-		<item value="com.crt.red_suite.feature:2.0.4.200905280812"/>
+		<item value="com.crt.red_suite.feature:2.0.5.200905281200"/>
 		<item value="org.eclipse.cdt:4.0.3.200802251018"/>
 		<item value="org.eclipse.cvs:1.0.2.r33x_r20080129-7C79_B_GLJwq3I9ZCD8L_"/>
 		<item value="org.eclipse.platform:3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft"/>
@@ -17,8 +17,8 @@
 		<item value="443" key="DIALOG_WIDTH"/>
 		<item value="true" key="BUILD_NOW"/>
 		<item value="265" key="DIALOG_Y_ORIGIN"/>
-		<item value="619" key="DIALOG_X_ORIGIN"/>
 		<item value="390" key="DIALOG_HEIGHT"/>
+		<item value="619" key="DIALOG_X_ORIGIN"/>
 		<item value="false" key="TOGGLE_SELECTED"/>
 	</section>
 </section>
diff --git a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
index 42b28b58a5..17020b4f0d 100644
--- a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
+++ b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
@@ -5,8 +5,8 @@
 		<item value="531" key="DIALOG_X_ORIGIN"/>
 	</section>
 	<section name="org.eclipse.ui.preferences.keysPreferencePage">
-		<item value="true" key="uncategorizedFilter"/>
 		<item value="true" key="showAllField"/>
+		<item value="true" key="uncategorizedFilter"/>
 		<item value="true" key="internalFilter"/>
 		<item value="true" key="showAllConvert"/>
 		<item value="true" key="actionSetFilter"/>
diff --git a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
index 562058c048..3b2889a01b 100644
--- a/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
+++ b/Demo/CORTEX_LPC1766_GCC_RedSuite/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
@@ -35,12 +35,24 @@
 </folder>
 </info>
 </editorArea>
-<editor activePart="true" focus="true" id="org.eclipse.cdt.ui.editor.CEditor" name="main.c" partName="main.c" path="C:/E/Dev/FreeRTOS/WorkingCopy3/Demo/CORTEX_LPC1766_GCC_RedSuite/RTOSDemo/main.c" title="main.c" tooltip="RTOSDemo/main.c" workbook="DefaultEditorWorkbook">
+<editor focus="true" id="org.eclipse.cdt.ui.editor.CEditor" name="main.c" partName="main.c" path="C:/E/Dev/FreeRTOS/WorkingCopy3/Demo/CORTEX_LPC1766_GCC_RedSuite/RTOSDemo/main.c" title="main.c" tooltip="RTOSDemo/main.c" workbook="DefaultEditorWorkbook">
 <input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/RTOSDemo/main.c"/>
-<editorState selectionHPixel="0" selectionLength="0" selectionOffset="0"/>
+<editorState selectionHPixel="0" selectionLength="0" selectionOffset="4707"/>
 </editor>
 </editors>
 <views>
+<view id="org.eclipse.debug.ui.DebugView" partName="Debug">
+<viewState/>
+</view>
+<view id="org.eclipse.ui.views.TaskList" partName="Tasks"/>
+<view id="org.eclipse.debug.ui.VariableView" partName="Variables">
+<viewState/>
+</view>
+<view id="org.eclipse.debug.ui.BreakpointView" partName="Breakpoints">
+<viewState>
+<isTrackingSelection value="false"/>
+</viewState>
+</view>
 <view id="com.crt.config.browserview.BrowserView" partName="Datasheet browser">
 <viewState/>
 </view>
@@ -57,13 +69,10 @@
 <element path="/RTOSDemo"/>
 </expanded>
 <selection>
-<element path="/RTOSDemo/Makefile"/>
+<element path="/RTOSDemo"/>
 </selection>
 </viewState>
 </view>
-<view id="org.eclipse.debug.ui.DebugView" partName="Debug">
-<viewState/>
-</view>
 <view id="org.eclipse.ui.views.ProblemView" partName="Problems">
 <viewState columnWidth0="253" columnWidth1="78" columnWidth2="153" columnWidth3="63" columnWidth4="0" horizontalPosition="0" verticalPosition="0">
 <columnOrder columnOrderIndex="0"/>
@@ -76,17 +85,8 @@
 <view id="org.eclipse.ui.console.ConsoleView" partName="Console">
 <viewState/>
 </view>
-<view id="org.eclipse.debug.ui.BreakpointView" partName="Breakpoints">
-<viewState>
-<isTrackingSelection value="false"/>
-</viewState>
-</view>
-<view id="org.eclipse.debug.ui.VariableView" partName="Variables">
-<viewState/>
-</view>
-<view id="org.eclipse.ui.views.TaskList" partName="Tasks"/>
 </views>
-<perspectives activePart="org.eclipse.cdt.ui.editor.CEditor" activePerspective="org.eclipse.cdt.ui.CPerspective">
+<perspectives activePart="org.eclipse.ui.console.ConsoleView" activePerspective="org.eclipse.cdt.ui.CPerspective">
 <perspective editorAreaTrimState="2" editorAreaVisible="1" fixed="0" version="0.016">
 <descriptor class="org.eclipse.cdt.internal.ui.CPerspectiveFactory" id="org.eclipse.cdt.ui.CPerspective" label="C/C++"/>
 <alwaysOnActionSet id="com.crt.utils.support.actionSet"/>
@@ -245,20 +245,29 @@
 <view id="org.eclipse.debug.ui.VariableView"/>
 <view id="org.eclipse.debug.ui.BreakpointView"/>
 <fastViewBars/>
-<layout>&#x0A;<mainWindow>&#x0A;<info folder="true" part="org.eclipse.debug.internal.ui.NavigatorFolderView">&#x0A;<folder activePageID="org.eclipse.debug.ui.DebugView" appearance="2" expanded="2">&#x0A;<page content="org.eclipse.debug.ui.DebugView" label="Debug"/>
+<layout>
+<mainWindow>
+<info folder="true" part="org.eclipse.debug.internal.ui.NavigatorFolderView">
+<folder activePageID="org.eclipse.debug.ui.DebugView" appearance="2" expanded="2">
+<page content="org.eclipse.debug.ui.DebugView" label="Debug"/>
 <page content="com.crt.quickstart.views.QuickstartView" label="Quickstart Panel"/>
 <page content="org.eclipse.ui.views.ResourceNavigator" label="LabelNotFound"/>
-<presentation id="org.eclipse.ui.internal.presentations.r33.WorkbenchPresentationFactory_33">&#x0A;<part id="0"/>
+<presentation id="org.eclipse.ui.internal.presentations.r33.WorkbenchPresentationFactory_33">
+<part id="0"/>
 <part id="1"/>
 </presentation>
 </folder>
 </info>
-<info folder="true" part="stickyFolderRight" ratio="0.75" ratioLeft="1254" ratioRight="418" relationship="2" relative="org.eclipse.debug.internal.ui.NavigatorFolderView">&#x0A;<folder appearance="2" expanded="2">&#x0A;<page content="org.eclipse.help.ui.HelpView" label="LabelNotFound"/>
+<info folder="true" part="stickyFolderRight" ratio="0.75" ratioLeft="1254" ratioRight="418" relationship="2" relative="org.eclipse.debug.internal.ui.NavigatorFolderView">
+<folder appearance="2" expanded="2">
+<page content="org.eclipse.help.ui.HelpView" label="LabelNotFound"/>
 <page content="org.eclipse.ui.internal.introview" label="LabelNotFound"/>
 <page content="org.eclipse.ui.cheatsheets.views.CheatSheetView" label="LabelNotFound"/>
 </folder>
 </info>
-<info folder="true" part="org.eclipse.debug.internal.ui.ConsoleFolderView" ratio="0.8373102" ratioLeft="772" ratioRight="150" relationship="4" relative="org.eclipse.debug.internal.ui.NavigatorFolderView">&#x0A;<folder activePageID="org.eclipse.ui.console.ConsoleView" appearance="2" expanded="2">&#x0A;<page content="org.eclipse.ui.console.ConsoleView" label="Console"/>
+<info folder="true" part="org.eclipse.debug.internal.ui.ConsoleFolderView" ratio="0.8373102" ratioLeft="772" ratioRight="150" relationship="4" relative="org.eclipse.debug.internal.ui.NavigatorFolderView">
+<folder activePageID="org.eclipse.ui.console.ConsoleView" appearance="2" expanded="2">
+<page content="org.eclipse.ui.console.ConsoleView" label="Console"/>
 <page content="org.eclipse.ui.views.TaskList" label="Tasks"/>
 <page content="org.eclipse.ui.views.ProblemView" label="Problems"/>
 <page content="com.crt.config.browserview.BrowserView" label="Datasheet browser"/>
@@ -266,7 +275,8 @@
 <page content="org.eclipse.ui.views.PropertySheet" label="LabelNotFound"/>
 <page content="com.crt.swv.views.SwvViews" label="LabelNotFound"/>
 <page content="org.eclipse.debug.ui.MemoryView" label="LabelNotFound"/>
-<presentation id="org.eclipse.ui.internal.presentations.r33.WorkbenchPresentationFactory_33">&#x0A;<part id="0"/>
+<presentation id="org.eclipse.ui.internal.presentations.r33.WorkbenchPresentationFactory_33">
+<part id="0"/>
 <part id="1"/>
 <part id="2"/>
 <part id="3"/>
@@ -274,12 +284,16 @@
 </folder>
 </info>
 <info part="org.eclipse.ui.editorss" ratio="0.3706112" ratioLeft="285" ratioRight="484" relationship="4" relative="org.eclipse.debug.internal.ui.NavigatorFolderView"/>
-<info folder="true" part="org.eclipse.debug.internal.ui.OutlineFolderView" ratio="0.5482325" ratioLeft="915" ratioRight="754" relationship="2" relative="org.eclipse.ui.editorss">&#x0A;<folder appearance="2" expanded="2">&#x0A;<page content="org.eclipse.ui.views.ContentOutline" label="LabelNotFound"/>
+<info folder="true" part="org.eclipse.debug.internal.ui.OutlineFolderView" ratio="0.5482325" ratioLeft="915" ratioRight="754" relationship="2" relative="org.eclipse.ui.editorss">
+<folder appearance="2" expanded="2">
+<page content="org.eclipse.ui.views.ContentOutline" label="LabelNotFound"/>
 <page content="org.eclipse.cdt.debug.ui.DisassemblyView" label="LabelNotFound"/>
 <presentation id="org.eclipse.ui.internal.presentations.r33.WorkbenchPresentationFactory_33"/>
 </folder>
 </info>
-<info folder="true" part="org.eclipse.debug.internal.ui.ToolsFolderView" ratio="0.5" ratioLeft="836" ratioRight="836" relationship="2" relative="org.eclipse.debug.internal.ui.NavigatorFolderView">&#x0A;<folder activePageID="org.eclipse.debug.ui.VariableView" appearance="2" expanded="2">&#x0A;<page content="org.eclipse.debug.ui.VariableView" label="Variables"/>
+<info folder="true" part="org.eclipse.debug.internal.ui.ToolsFolderView" ratio="0.5" ratioLeft="836" ratioRight="836" relationship="2" relative="org.eclipse.debug.internal.ui.NavigatorFolderView">
+<folder activePageID="org.eclipse.debug.ui.VariableView" appearance="2" expanded="2">
+<page content="org.eclipse.debug.ui.VariableView" label="Variables"/>
 <page content="org.eclipse.debug.ui.BreakpointView" label="Breakpoints"/>
 <page content="org.eclipse.debug.ui.ExpressionView" label="LabelNotFound"/>
 <page content="org.eclipse.debug.ui.RegisterView" label="LabelNotFound"/>
@@ -288,7 +302,8 @@
 <page content="com.crt.trueview.views.DisassemblyViewer" label="LabelNotFound"/>
 <page content="org.eclipse.cdt.debug.ui.SignalsView" label="LabelNotFound"/>
 <page content="org.eclipse.cdt.debug.ui.ModulesView" label="LabelNotFound"/>
-<presentation id="org.eclipse.ui.internal.presentations.r33.WorkbenchPresentationFactory_33">&#x0A;<part id="0"/>
+<presentation id="org.eclipse.ui.internal.presentations.r33.WorkbenchPresentationFactory_33">
+<part id="0"/>
 <part id="1"/>
 </presentation>
 </folder>
@@ -309,9 +324,6 @@
 <editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.cdt.make.editor" path="/RTOSDemo/Makefile"/>
 </editors>
 <item historyLabel="BlockQ.c" index="3">
-<position info="not_deleted" x="5859" y="0"/>
-</item>
-<item historyLabel="BlockQ.c" index="3">
 <position info="not_deleted" x="5925" y="0"/>
 </item>
 <item historyLabel="BlockQ.c" index="3">