Index: source/ariba/utility/system/EnterMethod.cpp
===================================================================
--- source/ariba/utility/system/EnterMethod.cpp	(revision 4679)
+++ source/ariba/utility/system/EnterMethod.cpp	(revision 4699)
@@ -52,4 +52,7 @@
 void EnterMethod::enter(){
 
+	SystemQueue::instance()::enterMethod();
+
+	/*
 	{ boost::mutex::scoped_lock lock( waitForEnterMutex );
 
@@ -58,13 +61,19 @@
 		waitForEnter.wait( lock );
 	}
+	*/
 }
 
 void EnterMethod::leave(){
 
+	SystemQueue::instance()::leaveMethod();
+
+	/*
 	{ boost::mutex::scoped_lock lock( waitForLeaveMutex );
 		waitForLeave.notify_one();
 	}
+	*/
 }
 
+/*
 void EnterMethod::handleSystemEvent( const SystemEvent& event ){
 
@@ -78,4 +87,4 @@
 	}
 }
-
+*/
 }} // namespace ariba, common
Index: source/ariba/utility/system/EnterMethod.h
===================================================================
--- source/ariba/utility/system/EnterMethod.h	(revision 4679)
+++ source/ariba/utility/system/EnterMethod.h	(revision 4699)
@@ -64,7 +64,8 @@
 	
 protected:
-	void handleSystemEvent(const SystemEvent& event);
+	//void handleSystemEvent(const SystemEvent& event);
 	
 private:
+	/*
 	boost::condition_variable waitForEnter;
 	boost::condition_variable waitForLeave;
@@ -72,5 +73,5 @@
 	boost::mutex waitForEnterMutex;
 	boost::mutex waitForLeaveMutex;
-
+	*/
 };
 
Index: source/ariba/utility/system/SystemQueue.cpp
===================================================================
--- source/ariba/utility/system/SystemQueue.cpp	(revision 4679)
+++ source/ariba/utility/system/SystemQueue.cpp	(revision 4699)
@@ -111,4 +111,14 @@
 }
 
+void SystemQueue::enterMethod(){
+	// TODO: omnet case and delay scheduler
+	directScheduler.lock();
+}
+
+void SystemQueue::leaveMethod(){
+	// TODO: omnet case and delay scheduler
+	directScheduler.unlock();
+}
+
 //***************************************************************
 #ifndef UNDERLAY_OMNET
Index: source/ariba/utility/system/SystemQueue.h
===================================================================
--- source/ariba/utility/system/SystemQueue.h	(revision 4679)
+++ source/ariba/utility/system/SystemQueue.h	(revision 4699)
@@ -80,5 +80,7 @@
 class SystemQueue : public cSimpleModule {
 #endif
+	
 	use_logging_h(SystemQueue);
+	friend class EnterMethod;
 public:
 	/**
@@ -137,4 +139,14 @@
 
 protected:
+
+	/**
+	 * Aqcuire the mutex
+	 */
+	void enterMethod();
+
+	/**
+	 * Leave the mutex
+	 */
+	void leaveMethod();
 
 	/**