diff --git a/ungleich-infrastructure.dot b/ungleich-infrastructure.dot
index 37c6193..cdf35dd 100644
--- a/ungleich-infrastructure.dot
+++ b/ungleich-infrastructure.dot
@@ -22,11 +22,42 @@ graph G {
         server4p5 [ label="server4\nopennebula nodes\nceph osd" ];
 
         routersp5 [ label="router1+2\nfirewall\nrouter\nnetboot" ];
-        red1p5 [ label="red1\nceph monitor\nopennebula mysql" ];
-        red2p5 [ label="red2\nceph monitor\n" ];
-	red3p	uplinkswitch -- ups1small [ label="Power connection 840W" ]
-	red1p5 -- ups1small [label="Power connection 12W" ]
-	{server3p5,server4p5,router1p5,router2p5} -- noorunknownups [ label="???" ]
+        red1 [ label="red1\nceph monitor\nopennebula mysql" ];
+        red23 [ label="red2-3\nceph monitor\n" ];
+        cephp5 [ label="ceph cluster" shape=oval ];
+        onep5 [ label="opennebula cluster" shape=oval ];
+
+        subgraph cluster_place5_switches {
+            label="Switches place5";
+
+            switch1p5 [ label="switch1"];
+            switch2p5 [ label="switch2"];
+            switch1p5--switch2p5 [ label="20G\nLACP\nMLAG" ];
+        }
+        {server1p5,server2p5,server3p5,server4p5,routersp5}--{switch1p5,switch2p5} [ label="20G\nLACP" ];
+
+        server1p5--{server1p5,server2p5,server3p5,server4p5} [ label="Manage VMs" ];
+        cephp5--{server1p5,server2p5,server3p5,server4p5,red1,red23}
+        onep5--{server1p5,server2p5,server3p5,server4p5,red1} [ label="consists of" ];
+        {server1p5,server2p5,server3p5,server4p5}--routersp5 [ label="Netboot" ];
+
+        # This is the power connections
+        ups1 [ label="UPS1\n2200VA\n1320W" ]
+        ups2 [ label="UPS2\n2200VA\n1320W" ]
+        ups3 [ label="UPS3\n2200VA\n1320W" ]
+        ups4 [ label="UPS4\n2200VA\n1320W" ]
+        ups1small [ label="UPS1-Small\n1000VA\n550W" ]
+        noorunknownups [ label="No or unknown UPS" ]
+
+        server1p5 -- ups1 [ label="Power connection 1100W" ]
+        server2p5 -- ups3 [ label="Power connection 1100W" ]
+	mdarrayserver2 -- ups2 [ label="Power connection 600W" ]
+	mdarrayserver3 -- ups4 [ label="Power connection 600W" ]
+	mdarrayserver4 -- ups5 [ label="Power connection 600W" ]
+	switch1p5 -- ups4 [ label="Power connection 460W" ]
+	switch2p5 -- upsx [ label="Power connection 460W" ]  
+	
+        {server3p5,server4p5,router1p5,router2p5} -- noorunknownups [ label="???" ]
 
         # MDarray section
         mdarrayserver2 [ label="MDArray (server2)" ]