diff --git a/server/etc/armo-demo.conf b/server/etc/armo-demo.conf
index 02ef325d7..7f2e79476 100644
--- a/server/etc/armo-demo.conf
+++ b/server/etc/armo-demo.conf
@@ -1,49 +1,29 @@
-# This is an example for a minimal loopback configuration.
-#
-# All messages will be sent back to the origin using UDP packets.
-#
-# You can use this configuration in conjunction with the 'send', 'receive' and 'random'
-# utilities as shown below (run all three steps in parallel).
-#
-# 0. Overview:
-#
-#    ./random --PIPE--> ./send  --UDP--> ./server --UDP--> ./receive
-#
-# 1. Start server:
-#
-#    $ ./server etc/loopback.conf
-#
-# 2. Send random data to server:
-#
-#    $ ./random 4 10 | ./send etc/loopback.conf node1 -r
-#
-# 3. Receive data from server:
-#
-#    $ ./receive etc/loopback.conf node2 -r
+# Configuration file for Mohsen and Arthur
 #
+# Date:		25.09.15
 # Author:	Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
 # Copyright:	2015, Institute for Automation of Complex Power Systems, EONERC
 ##
 
-stats = 1;
-debug = 2;
+stats = 0.5;
+debug = 3;
 
 nodes = {
 	rtds = {
 		type = "socket",
 		layer = "udp",
-		local = "*:13000",		# Local ip:port, use '*' for random port
-		remote = "127.0.0.1:13001",
+		local = "10.10.11.1:12000",		# Local ip:port, use '*' for random port
+		remote = "127.0.0.1:12001",
 	},
 	broker = {
 		type = "ngsi",
 		endpoint = "https://130.206.112.223:1026",
 
 		ssl_verify = false,
-		timeout = 0.8,
+		timeout = 1,
 		structure = "children",
 		mapping = [
-			"6a224113-62c4-11e5-b7be-ecf4bb16fe0c(GridSectionDataValue).value(float)", // Node: name='Linea 0 Tr'
+			"6a224113-62c4-11e5-b7be-ecf4bb16fe0c(GridSectionDataValue).value(float)" // Node: name='Linea 0 Tr'
 			"fca3bf58-62c4-11e5-867e-ecf4bb16fe0c(GridSectionDataValue).value(float)", // Conn: name='Linea 0 WP4_C0.1', from='Linea 0 Tr', to='Linea 0 Meter'
 			"fd4e0912-62c4-11e5-ba9b-ecf4bb16fe0c(GridSectionDataValue).value(float)", // Conn: name='Linea 1 WP4_C_1', from='Linea 1 N0000', to='Linea 1 N0001'
 			"fd4e0924-62c4-11e5-80a5-ecf4bb16fe0c(GridSectionDataValue).value(float)", // Conn: name='Linea 4 WP4_C_4', from='Linea 4 N0000', to='Linea 4 N0001'
@@ -62,6 +42,6 @@ paths = (
 	{
 		in = "rtds",				# Name of the node we listen to (see above)
 		out = "broker",				# And we loop back to the origin
-		rate = 1				# in Requests / sec
+		rate = 10				# in Requests / sec
 	}
 );