diff --git a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.project b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.project
index 883ac38b1..17a6feb5e 100644
--- a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.project
+++ b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.project
@@ -35,11 +35,6 @@
 			<type>2</type>
 			<locationURI>virtual:/virtual</locationURI>
 		</link>
-		<link>
-			<name>Source/stream_buffer.c</name>
-			<type>1</type>
-			<locationURI>FREERTOS_ROOT/FreeRTOS/Source/stream_buffer.c</locationURI>
-		</link>
 		<link>
 			<name>Source/Common_Demo_Source/Minimal</name>
 			<type>2</type>
@@ -88,39 +83,156 @@
 	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1395248551327</id>
+			<id>1597858150422</id>
 			<name>Source/Common_Demo_Source/Minimal</name>
-			<type>6</type>
+			<type>5</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-alt*.c</arguments>
+				<arguments>1.0-name-matches-false-false-BlockQ.c</arguments>
 			</matcher>
 		</filter>
 		<filter>
-			<id>1395248551343</id>
+			<id>1597858150469</id>
 			<name>Source/Common_Demo_Source/Minimal</name>
-			<type>6</type>
+			<type>5</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-com*.c</arguments>
+				<arguments>1.0-name-matches-false-false-blocktim.c</arguments>
 			</matcher>
 		</filter>
 		<filter>
-			<id>1395248551358</id>
+			<id>1597858150500</id>
 			<name>Source/Common_Demo_Source/Minimal</name>
-			<type>6</type>
+			<type>5</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-cr*.c</arguments>
+				<arguments>1.0-name-matches-false-false-countsem.c</arguments>
 			</matcher>
 		</filter>
 		<filter>
-			<id>1395248551374</id>
+			<id>1597858150516</id>
 			<name>Source/Common_Demo_Source/Minimal</name>
-			<type>6</type>
+			<type>5</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-sp_flop.c</arguments>
+				<arguments>1.0-name-matches-false-false-death.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1597858150547</id>
+			<name>Source/Common_Demo_Source/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-dynamic.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1597858150578</id>
+			<name>Source/Common_Demo_Source/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-EventGroupsDemo.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1597858150609</id>
+			<name>Source/Common_Demo_Source/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-flop.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1597858150641</id>
+			<name>Source/Common_Demo_Source/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-GenQTest.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1597858150672</id>
+			<name>Source/Common_Demo_Source/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-IntQueue.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1597858150703</id>
+			<name>Source/Common_Demo_Source/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-IntQueue.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1597858150734</id>
+			<name>Source/Common_Demo_Source/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-IntSemTest.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1597858150766</id>
+			<name>Source/Common_Demo_Source/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-QueueOverwrite.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1597858150781</id>
+			<name>Source/Common_Demo_Source/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-recmutex.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1597858150844</id>
+			<name>Source/Common_Demo_Source/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-semtest.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1597858150891</id>
+			<name>Source/Common_Demo_Source/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-TaskNotify.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1597858150922</id>
+			<name>Source/Common_Demo_Source/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-TimerDemo.c</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1597858150969</id>
+			<name>Source/Common_Demo_Source/Minimal</name>
+			<type>5</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-flash.c</arguments>
 			</matcher>
 		</filter>
 		<filter>
diff --git a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/FreeRTOSConfig.h b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/FreeRTOSConfig.h
index c43f56c61..e4afa4b1c 100644
--- a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/FreeRTOSConfig.h
@@ -67,7 +67,6 @@
 #define configUSE_COUNTING_SEMAPHORES	1
 #define configMAX_PRIORITIES			( 7 )
 #define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
-#define configTASK_NOTIFICATION_ARRAY_ENTRIES ( 3 )
 
 /* Software timer definitions. */
 #define configUSE_TIMERS				1