diff --git a/Dockerfiles/forContainerNet/device/bootstrap_client.py b/Dockerfiles/forContainerNet/device/bootstrap_client.py
index d2f06a7..92319b2 100755
--- a/Dockerfiles/forContainerNet/device/bootstrap_client.py
+++ b/Dockerfiles/forContainerNet/device/bootstrap_client.py
@@ -9,7 +9,7 @@ BOOTSTRAP_SERVER_ADDRESS = '10.10.10.10:5555'
 
 def retrieve_config():
     my_json_config = {"verdict":"oops"}
-    my_ip = str(subprocess.check_output("echo $MY_IP", shell=True)).rstrip()
+    my_ip = str(subprocess.check_output("sleep $((6 + RANDOM % 10)) && echo $MY_IP", shell=True)).rstrip()
     print("MY_IP : %s"%(my_ip))
     while my_json_config["verdict"] != "yes":
         try:
diff --git a/topologie/topology_test.py b/topologie/topology_test.py
index 8712911..a18c8f7 100755
--- a/topologie/topology_test.py
+++ b/topologie/topology_test.py
@@ -94,7 +94,7 @@ Necessary docker images: config:topo ; server:topo ; gateway:topo ; device:topo
 '''
 #####################################################################################################
 
-#SVR_IP = '12.10.110.1' #name = srv
+
 def create_topology():
     net = DCNetwork(monitor=False, enable_learning=True)
 
@@ -139,12 +139,14 @@ def create_topology():
     #dev2gwf3 = net.addDocker('dev2gwf3', ip=DEV2_GWF3_IP, dimage="device:topo", environment={'MY_IP':DEV2_GWF3_IP})
     #dev3gwf3 = net.addDocker('dev3gwf3', ip=DEV3_GWF3_IP, dimage="device:topo", environment={'MY_IP':DEV3_GWF3_IP})
 
-    #info('*** Adding switches\n')
+    info('*** Adding switches\n')
     s1 = net.addSwitch('s1')
     s2 = net.addSwitch('s2')
     s3 = net.addSwitch('s3')
     s4 = net.addSwitch('s4')
     s5 = net.addSwitch('s5')
+    #s6 = net.addSwitch('s6')
+    #s7 = net.addSwitch('s7')
 
     info('*** Creating links\n')
     net.addLink(btrap, s2)
@@ -152,21 +154,27 @@ def create_topology():
     net.addLink(s1, srv)
     net.addLink(gwi1, s2)
     net.addLink(s2, s3)
-    net.addLink(s2, s4)
-    #net.addLink(s3, s4)
+    #net.addLink(s2, s4)
+    net.addLink(s3, s4)
     net.addLink(dc1, s4)
-    net.addLink(gwf1, s3)
-    net.addLink(dev1gwf1, gwf1)
-    net.addLink(dev2gwf1, gwf1)
-    net.addLink(dev3gwf1, gwf1)
-    #net.addLink(gwf2, s3)
-    #net.addLink(dev1gwf2, gwf2)
-    #net.addLink(dev2gwf2, gwf2)
-    #net.addLink(dev3gwf2, gwf2)
-    #net.addLink(gwf3, s4)
-    #net.addLink(dev1gwf3, gwf3)
-    #net.addLink(dev2gwf3, gwf3)
-    #net.addLink(dev3gwf3, gwf3)
+    ########ZONE1###########
+    net.addLink(s3, s5)
+    net.addLink(gwf1, s5)
+    net.addLink(dev1gwf1, s5)
+    net.addLink(dev2gwf1, s5)
+    net.addLink(dev3gwf1, s5)
+    ########ZONE2###########
+    #net.addLink(s3, s6)
+    #net.addLink(gwf2, s6)
+    #net.addLink(dev1gwf2, s6)
+    #net.addLink(dev2gwf2, s6)
+    #net.addLink(dev3gwf2, s6)
+    ########ZONE3###########
+    #net.addLink(s4, s7)
+    #net.addLink(gwf3, s7)
+    #net.addLink(dev1gwf3, s7)
+    #net.addLink(dev2gwf3, s7)
+    #net.addLink(dev3gwf3, s7)
 
     info('*** Starting network\n')
     net.start()