diff --git a/source/shoh/src/main.cpp b/source/shoh/src/main.cpp
index 579acae..7b04fab 100644
--- a/source/shoh/src/main.cpp
+++ b/source/shoh/src/main.cpp
@@ -29,6 +29,10 @@ int main(void)
   qmanager->createQueue(100,
                         sizeof(Event),
                         ThreadCommon::QueueManager::master_event_all);
+  qmanager->createQueue(20,
+                        sizeof(Event),
+                        ThreadCommon::QueueManager::manager_event_master);
+  
   //Creating tasks
   manager->createTask(master_thread, "master",
                       configMINIMAL_STACK_SIZE * 10,tskIDLE_PRIORITY + 1UL,
diff --git a/source/shoh/src/threads/manager/Manager.cpp b/source/shoh/src/threads/manager/Manager.cpp
index b1f2b2d..6490dc5 100644
--- a/source/shoh/src/threads/manager/Manager.cpp
+++ b/source/shoh/src/threads/manager/Manager.cpp
@@ -21,9 +21,10 @@ Manager::~Manager()
 
 void Manager::taskFunction()
 {
+	Event data(Event::Null, 0);
 	for(;;)
 	{
-		vTaskDelay(1);
+		_qm->receive<Event>(ThreadCommon::QueueManager::manager_event_master, &data, portMAX_DELAY);
 	}
 }
 
diff --git a/source/shoh/src/threads/manager/Manager.h b/source/shoh/src/threads/manager/Manager.h
index f214a04..1516073 100644
--- a/source/shoh/src/threads/manager/Manager.h
+++ b/source/shoh/src/threads/manager/Manager.h
@@ -17,7 +17,6 @@ public:
 	virtual ~Manager();
 	void taskFunction();
 private:
-	Event* message;
 	ThreadCommon::QueueManager* _qm;
 };