X-Git-Url: https://git.llucax.com/z.facultad/75.43/tp2.git/blobdiff_plain/b4f122fc966bb813516d804a7acef41378a14f9a..4c6067828a9578296744b91dd89c9c0c213ea4eb:/diagrama.dia?ds=inline

diff --git a/diagrama.dia b/diagrama.dia
index 4d0b5dc..e44a0c4 100644
--- a/diagrama.dia
+++ b/diagrama.dia
@@ -25,13 +25,19 @@
           <dia:real val="2.8222000598907471"/>
         </dia:attribute>
         <dia:attribute name="is_portrait">
-          <dia:boolean val="true"/>
+          <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="1"/>
+          <dia:real val="0.49173647165298462"/>
         </dia:attribute>
         <dia:attribute name="fitto">
-          <dia:boolean val="false"/>
+          <dia:boolean val="true"/>
+        </dia:attribute>
+        <dia:attribute name="fitwidth">
+          <dia:int val="1"/>
+        </dia:attribute>
+        <dia:attribute name="fitheight">
+          <dia:int val="1"/>
         </dia:attribute>
       </dia:composite>
     </dia:attribute>
@@ -65,13 +71,13 @@
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Activity" version="0" id="O0">
       <dia:attribute name="obj_pos">
-        <dia:point val="24.8529,28.2657"/>
+        <dia:point val="26,19"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.8529,28.2657;28.8529,30.0657"/>
+        <dia:rectangle val="26,19;30,20.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.8529,28.2657"/>
+        <dia:point val="26,19"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -91,7 +97,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="26.8529,29.3657"/>
+            <dia:point val="28,20.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -104,13 +110,13 @@
     </dia:object>
     <dia:object type="UML - Activity" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.12083,-0.860433"/>
+        <dia:point val="2,-5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.12083,-0.860433;6.12083,0.939567"/>
+        <dia:rectangle val="2,-5;6,-3.2"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="2.12083,-0.860433"/>
+        <dia:point val="2,-5"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -130,7 +136,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.12083,0.239567"/>
+            <dia:point val="4,-3.9"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -143,13 +149,13 @@
     </dia:object>
     <dia:object type="UML - Activity" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="46.5747,-3.92612"/>
+        <dia:point val="46.8747,-3.67612"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="46.5747,-3.92612;50.5747,-2.12612"/>
+        <dia:rectangle val="46.8747,-3.67612;50.8747,-1.87612"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="46.5747,-3.92612"/>
+        <dia:point val="46.8747,-3.67612"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -169,7 +175,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="48.5747,-2.82612"/>
+            <dia:point val="48.8747,-2.57612"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -182,52 +188,13 @@
     </dia:object>
     <dia:object type="UML - Activity" version="0" id="O3">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.3854,16.0322"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.3854,16.0322;18.3854,17.8322"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="14.3854,16.0322"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="4"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="1.8"/>
-      </dia:attribute>
-      <dia:attribute name="text">
-        <dia:composite type="text">
-          <dia:attribute name="string">
-            <dia:string>#X.25#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="font">
-            <dia:font family="sans" style="0" name="Helvetica"/>
-          </dia:attribute>
-          <dia:attribute name="height">
-            <dia:real val="0.80000000000000004"/>
-          </dia:attribute>
-          <dia:attribute name="pos">
-            <dia:point val="16.3854,17.1322"/>
-          </dia:attribute>
-          <dia:attribute name="color">
-            <dia:color val="#000000"/>
-          </dia:attribute>
-          <dia:attribute name="alignment">
-            <dia:enum val="1"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-    </dia:object>
-    <dia:object type="UML - Activity" version="0" id="O4">
-      <dia:attribute name="obj_pos">
-        <dia:point val="43.1426,17.1767"/>
+        <dia:point val="41,15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="43.1426,17.1767;47.1426,18.9767"/>
+        <dia:rectangle val="41,15;45,16.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="43.1426,17.1767"/>
+        <dia:point val="41,15"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -247,7 +214,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="45.1426,18.2767"/>
+            <dia:point val="43,16.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -258,15 +225,15 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Activity" version="0" id="O5">
+    <dia:object type="UML - Activity" version="0" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="18.4428,35.0284"/>
+        <dia:point val="20,22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.4428,35.0284;22.4428,36.8284"/>
+        <dia:rectangle val="20,22;24,23.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="18.4428,35.0284"/>
+        <dia:point val="20,22"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -286,7 +253,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="20.4428,36.1284"/>
+            <dia:point val="22,23.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -297,7 +264,7 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Activity" version="0" id="O6">
+    <dia:object type="UML - Activity" version="0" id="O5">
       <dia:attribute name="obj_pos">
         <dia:point val="17.3937,-5.05698"/>
       </dia:attribute>
@@ -336,7 +303,7 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Activity" version="0" id="O7">
+    <dia:object type="UML - Activity" version="0" id="O6">
       <dia:attribute name="obj_pos">
         <dia:point val="46.6785,12.5494"/>
       </dia:attribute>
@@ -375,15 +342,15 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Activity" version="0" id="O8">
+    <dia:object type="UML - Activity" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.6452,8.4148"/>
+        <dia:point val="14,0"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.6452,8.4148;17.6452,10.2148"/>
+        <dia:rectangle val="14,0;18,1.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="13.6452,8.4148"/>
+        <dia:point val="14,0"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -403,7 +370,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="15.6452,9.5148"/>
+            <dia:point val="16,1.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -414,15 +381,15 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Activity" version="0" id="O9">
+    <dia:object type="UML - Activity" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.12083,22.8163"/>
+        <dia:point val="9,17"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.12083,22.8163;6.12083,24.6163"/>
+        <dia:rectangle val="9,17;13,18.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="2.12083,22.8163"/>
+        <dia:point val="9,17"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -442,7 +409,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.12083,23.9163"/>
+            <dia:point val="11,18.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -453,15 +420,15 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Activity" version="0" id="O10">
+    <dia:object type="UML - Activity" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="6.56439,35.0991"/>
+        <dia:point val="9,22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.56439,35.0991;10.5644,36.8991"/>
+        <dia:rectangle val="9,22;13,23.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="6.56439,35.0991"/>
+        <dia:point val="9,22"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -481,46 +448,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="8.56439,36.1991"/>
-          </dia:attribute>
-          <dia:attribute name="color">
-            <dia:color val="#000000"/>
-          </dia:attribute>
-          <dia:attribute name="alignment">
-            <dia:enum val="1"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-    </dia:object>
-    <dia:object type="UML - Activity" version="0" id="O11">
-      <dia:attribute name="obj_pos">
-        <dia:point val="46.0618,23.8435"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="46.0618,23.8435;50.0618,25.6435"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="46.0618,23.8435"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="4"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="1.8"/>
-      </dia:attribute>
-      <dia:attribute name="text">
-        <dia:composite type="text">
-          <dia:attribute name="string">
-            <dia:string>#internet#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="font">
-            <dia:font family="sans" style="0" name="Helvetica"/>
-          </dia:attribute>
-          <dia:attribute name="height">
-            <dia:real val="0.80000000000000004"/>
-          </dia:attribute>
-          <dia:attribute name="pos">
-            <dia:point val="48.0618,24.9435"/>
+            <dia:point val="11,23.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -531,15 +459,15 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Activity" version="0" id="O12">
+    <dia:object type="UML - Activity" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="37.9564,0.63368"/>
+        <dia:point val="38,0"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.9564,0.63368;41.9564,2.43368"/>
+        <dia:rectangle val="38,0;42,1.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="37.9564,0.63368"/>
+        <dia:point val="38,0"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4"/>
@@ -559,7 +487,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="39.9564,1.73368"/>
+            <dia:point val="40,1.1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -570,15 +498,15 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Jackson - domain" version="0" id="O13">
+    <dia:object type="Jackson - domain" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.1019,25.9532"/>
+        <dia:point val="35,22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.0569,25.9082;37.8238,27.4982"/>
+        <dia:rectangle val="34.955,21.955;38.722,23.545"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="34.1019,25.9532"/>
+        <dia:point val="35,22"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.6769552621700399"/>
@@ -604,7 +532,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="36.1404,26.8532"/>
+            <dia:point val="37.0385,22.9"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -627,15 +555,15 @@
         <dia:int val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Jackson - domain" version="0" id="O14">
+    <dia:object type="Jackson - domain" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="29.0769,14.2824"/>
+        <dia:point val="29,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.0319,14.2374;32.7989,15.883"/>
+        <dia:rectangle val="28.955,10.955;32.722,12.6006"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="29.0769,14.2824"/>
+        <dia:point val="29,11"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.6769552621700399"/>
@@ -661,7 +589,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="31.1154,15.2102"/>
+            <dia:point val="31.0385,11.9278"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -684,15 +612,15 @@
         <dia:int val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Jackson - domain" version="0" id="O15">
+    <dia:object type="Jackson - domain" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="29.6426,19.1614"/>
+        <dia:point val="28,16"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.5976,19.1164;34.2883,20.762"/>
+        <dia:rectangle val="27.955,15.955;32.6457,17.6006"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="29.6426,19.1614"/>
+        <dia:point val="28,16"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.6006915523956131"/>
@@ -718,7 +646,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="32.143,20.0892"/>
+            <dia:point val="30.5003,16.9278"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -741,7 +669,7 @@
         <dia:int val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Jackson - domain" version="0" id="O16">
+    <dia:object type="Jackson - domain" version="0" id="O14">
       <dia:attribute name="obj_pos">
         <dia:point val="46.9667,2.96866"/>
       </dia:attribute>
@@ -798,12 +726,12 @@
         <dia:int val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Jackson - domain" version="0" id="O17">
+    <dia:object type="Jackson - domain" version="0" id="O15">
       <dia:attribute name="obj_pos">
         <dia:point val="27.3799,-7.14297"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.3349,-7.18797;31.1018,-5.54233"/>
+        <dia:rectangle val="27.3349,-7.18797;31.1019,-5.54234"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="27.3799,-7.14297"/>
@@ -832,7 +760,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="29.4183,-6.21515"/>
+            <dia:point val="29.4184,-6.21515"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -855,7 +783,7 @@
         <dia:int val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Jackson - domain" version="0" id="O18">
+    <dia:object type="Jackson - domain" version="0" id="O16">
       <dia:attribute name="obj_pos">
         <dia:point val="25.6828,0.352365"/>
       </dia:attribute>
@@ -912,7 +840,7 @@
         <dia:int val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Jackson - domain" version="0" id="O19">
+    <dia:object type="Jackson - domain" version="0" id="O17">
       <dia:attribute name="obj_pos">
         <dia:point val="38.1986,8.05983"/>
       </dia:attribute>
@@ -969,15 +897,15 @@
         <dia:int val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Jackson - domain" version="0" id="O20">
+    <dia:object type="Jackson - domain" version="0" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="25.8242,8.48409"/>
+        <dia:point val="26,6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.7792,8.43909;29.5462,10.0847"/>
+        <dia:rectangle val="25.955,5.955;29.722,7.60063"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="25.8242,8.48409"/>
+        <dia:point val="26,6"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.6769552621700399"/>
@@ -1003,7 +931,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="27.8627,9.41191"/>
+            <dia:point val="28.0385,6.92782"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1026,15 +954,15 @@
         <dia:int val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Jackson - domain" version="0" id="O21">
+    <dia:object type="Jackson - domain" version="0" id="O19">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.28235,5.79709"/>
+        <dia:point val="2,2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.23735,5.75209;6.00431,7.39772"/>
+        <dia:rectangle val="1.955,1.955;5.72196,3.60063"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="2.28235,5.79709"/>
+        <dia:point val="2,2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.6769552621700399"/>
@@ -1060,7 +988,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.32083,6.7249"/>
+            <dia:point val="4.03848,2.92782"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1083,15 +1011,15 @@
         <dia:int val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Jackson - domain" version="0" id="O22">
+    <dia:object type="Jackson - domain" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.28235,16.7572"/>
+        <dia:point val="2,17"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.23735,16.7122;6.00431,18.3579"/>
+        <dia:rectangle val="1.955,16.955;5.72196,18.6006"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="2.28235,16.7572"/>
+        <dia:point val="2,17"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.6769552621700399"/>
@@ -1117,7 +1045,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.32083,17.6851"/>
+            <dia:point val="4.03848,17.9278"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1140,15 +1068,15 @@
         <dia:int val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Jackson - domain" version="0" id="O23">
+    <dia:object type="Jackson - domain" version="0" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.5206,28.0002"/>
+        <dia:point val="17,17"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.4756,27.9552;17.2425,29.6009"/>
+        <dia:rectangle val="16.955,16.955;20.722,18.6006"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="13.5206,28.0002"/>
+        <dia:point val="17,17"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.6769552621700399"/>
@@ -1174,7 +1102,7 @@
             <dia:real val="0.69999999999999996"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="15.5591,28.9281"/>
+            <dia:point val="19.0385,17.9278"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1197,433 +1125,414 @@
         <dia:int val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Network - WAN Link" version="1" id="O24">
+    <dia:object type="Network - WAN Link" version="1" id="O22">
       <dia:attribute name="obj_pos">
-        <dia:point val="37.7788,26.7032"/>
+        <dia:point val="38.677,22.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.7788,25.6435;46.0618,26.7032"/>
+        <dia:rectangle val="38.677,21.0365;44.2546,22.75"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="37.7788,26.7032"/>
-        <dia:point val="46.0618,25.6435"/>
+        <dia:point val="38.677,22.75"/>
+        <dia:point val="44.2546,21.0365"/>
       </dia:attribute>
       <dia:attribute name="width">
         <dia:real val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O13" connection="7"/>
-        <dia:connection handle="1" to="O11" connection="5"/>
+        <dia:connection handle="0" to="O11" connection="7"/>
+        <dia:connection handle="1" to="O78" connection="0"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Network - WAN Link" version="1" id="O25">
+    <dia:object type="Network - WAN Link" version="1" id="O23">
       <dia:attribute name="obj_pos">
-        <dia:point val="33.0931,20.717"/>
+        <dia:point val="31.4505,17.5556"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.0931,20.717;46.0618,23.8435"/>
+        <dia:rectangle val="31.4505,17.5556;46.6491,19.5678"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="33.0931,20.717"/>
-        <dia:point val="46.0618,23.8435"/>
+        <dia:point val="31.4505,17.5556"/>
+        <dia:point val="46.6491,19.5678"/>
       </dia:attribute>
       <dia:attribute name="width">
         <dia:real val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O15" connection="6"/>
-        <dia:connection handle="1" to="O11" connection="0"/>
+        <dia:connection handle="0" to="O13" connection="6"/>
+        <dia:connection handle="1" to="O78" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O26">
+    <dia:object type="Standard - Line" version="0" id="O24">
       <dia:attribute name="obj_pos">
-        <dia:point val="24.8529,29.1657"/>
+        <dia:point val="26,19.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.1451,28.7256;24.9054,29.2181"/>
+        <dia:rectangle val="20.612,17.7128;26.065,19.965"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="24.8529,29.1657"/>
-        <dia:point val="17.1975,28.7781"/>
+        <dia:point val="26,19.9"/>
+        <dia:point val="20.677,17.7778"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O0" connection="3"/>
-        <dia:connection handle="1" to="O23" connection="7"/>
+        <dia:connection handle="1" to="O21" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O27">
+    <dia:object type="Standard - Line" version="0" id="O25">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.1019,26.7032"/>
+        <dia:point val="35,22.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.7864,26.6367;34.1684,29.2322"/>
+        <dia:rectangle val="29.9318,19.8318;35.0682,22.8182"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="34.1019,26.7032"/>
-        <dia:point val="28.8529,29.1657"/>
+        <dia:point val="35,22.75"/>
+        <dia:point val="30,19.9"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O13" connection="3"/>
+        <dia:connection handle="0" to="O11" connection="3"/>
         <dia:connection handle="1" to="O0" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O28">
-      <dia:attribute name="obj_pos">
-        <dia:point val="16.2783,29.5559"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.2082,29.4858;20.5129,35.0985"/>
-      </dia:attribute>
-      <dia:attribute name="conn_endpoints">
-        <dia:point val="16.2783,29.5559"/>
-        <dia:point val="20.4428,35.0284"/>
-      </dia:attribute>
-      <dia:attribute name="numcp">
-        <dia:int val="1"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O23" connection="6"/>
-        <dia:connection handle="1" to="O5" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O29">
+    <dia:object type="Standard - Line" version="0" id="O26">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.4398,29.5559"/>
+        <dia:point val="19.7577,18.5556"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.49371,29.4852;14.5105,35.1698"/>
+        <dia:rectangle val="19.6885,18.4864;22.0692,22.0692"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="14.4398,29.5559"/>
-        <dia:point val="8.56439,35.0991"/>
+        <dia:point val="19.7577,18.5556"/>
+        <dia:point val="22,22"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O23" connection="4"/>
-        <dia:connection handle="1" to="O10" connection="1"/>
+        <dia:connection handle="0" to="O21" connection="6"/>
+        <dia:connection handle="1" to="O4" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O30">
+    <dia:object type="Standard - Line" version="0" id="O27">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.5206,28.7781"/>
+        <dia:point val="17.9192,18.5556"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.05487,24.5503;13.5865,28.844"/>
+        <dia:rectangle val="10.933,18.4886;17.9862,22.067"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="13.5206,28.7781"/>
-        <dia:point val="4.12083,24.6163"/>
+        <dia:point val="17.9192,18.5556"/>
+        <dia:point val="11,22"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O23" connection="3"/>
-        <dia:connection handle="1" to="O9" connection="6"/>
+        <dia:connection handle="0" to="O21" connection="4"/>
+        <dia:connection handle="1" to="O9" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O31">
+    <dia:object type="Standard - Line" version="0" id="O28">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.3854,17.8322"/>
+        <dia:point val="17,17.7778"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.05219,17.7636;14.454,22.8849"/>
+        <dia:rectangle val="12.9485,17.7263;17.0515,17.9515"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="14.3854,17.8322"/>
-        <dia:point val="6.12083,22.8163"/>
+        <dia:point val="17,17.7778"/>
+        <dia:point val="13,17.9"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O3" connection="5"/>
-        <dia:connection handle="1" to="O9" connection="2"/>
+        <dia:connection handle="0" to="O21" connection="3"/>
+        <dia:connection handle="1" to="O8" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O32">
+    <dia:object type="Standard - Line" version="0" id="O29">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.12083,18.3129"/>
+        <dia:point val="5.67696,17.7778"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.07083,18.2629;4.17083,22.8663"/>
+        <dia:rectangle val="5.62516,17.726;9.0518,17.9518"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="4.12083,18.3129"/>
-        <dia:point val="4.12083,22.8163"/>
+        <dia:point val="5.67696,17.7778"/>
+        <dia:point val="9,17.9"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O22" connection="5"/>
-        <dia:connection handle="1" to="O9" connection="1"/>
+        <dia:connection handle="0" to="O20" connection="7"/>
+        <dia:connection handle="1" to="O8" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O33">
+    <dia:object type="Standard - Line" version="0" id="O30">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.12083,7.35272"/>
+        <dia:point val="3.83848,3.55563"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.07083,7.30272;4.17083,16.8072"/>
+        <dia:rectangle val="3.78848,3.50563;3.88848,17.05"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="4.12083,7.35272"/>
-        <dia:point val="4.12083,16.7572"/>
+        <dia:point val="3.83848,3.55563"/>
+        <dia:point val="3.83848,17"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O21" connection="5"/>
-        <dia:connection handle="1" to="O22" connection="1"/>
+        <dia:connection handle="0" to="O19" connection="5"/>
+        <dia:connection handle="1" to="O20" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O34">
+    <dia:object type="Standard - Line" version="0" id="O31">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.3854,16.9322"/>
+        <dia:point val="12.5942,11.4082"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.90587,16.8788;14.4388,17.5885"/>
+        <dia:rectangle val="4.68798,11.3385;12.664,17.0697"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="14.3854,16.9322"/>
-        <dia:point val="5.95931,17.5351"/>
+        <dia:point val="12.5942,11.4082"/>
+        <dia:point val="4.75772,17"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O3" connection="3"/>
-        <dia:connection handle="1" to="O22" connection="7"/>
+        <dia:connection handle="0" to="O79" connection="1"/>
+        <dia:connection handle="1" to="O20" connection="0"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O35">
+    <dia:object type="Standard - Line" version="0" id="O32">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.3854,16.0322"/>
+        <dia:point val="12.4597,8.41782"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.96941,7.28206;14.456,16.1029"/>
+        <dia:rectangle val="4.68875,3.48666;12.5287,8.48679"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="14.3854,16.0322"/>
-        <dia:point val="5.04007,7.35272"/>
+        <dia:point val="12.4597,8.41782"/>
+        <dia:point val="4.75772,3.55563"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O3" connection="0"/>
-        <dia:connection handle="1" to="O21" connection="6"/>
+        <dia:connection handle="0" to="O79" connection="3"/>
+        <dia:connection handle="1" to="O19" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O36">
+    <dia:object type="Standard - Line" version="0" id="O33">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.12083,5.79709"/>
+        <dia:point val="3.83848,2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.07083,0.889567;4.17083,5.84709"/>
+        <dia:rectangle val="3.78695,-3.25153;4.05153,2.05153"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="4.12083,5.79709"/>
-        <dia:point val="4.12083,0.939567"/>
+        <dia:point val="3.83848,2"/>
+        <dia:point val="4,-3.2"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O21" connection="1"/>
+        <dia:connection handle="0" to="O19" connection="1"/>
         <dia:connection handle="1" to="O1" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O37">
+    <dia:object type="Standard - Line" version="0" id="O34">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.95931,6.5749"/>
+        <dia:point val="5.67696,2.77782"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.89542,6.51102;13.709,9.37868"/>
+        <dia:rectangle val="5.61718,0.840222;14.0598,2.8376"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="5.95931,6.5749"/>
-        <dia:point val="13.6452,9.3148"/>
+        <dia:point val="5.67696,2.77782"/>
+        <dia:point val="14,0.9"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O21" connection="7"/>
-        <dia:connection handle="1" to="O8" connection="3"/>
+        <dia:connection handle="0" to="O19" connection="7"/>
+        <dia:connection handle="1" to="O7" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O38">
+    <dia:object type="Standard - Line" version="0" id="O35">
       <dia:attribute name="obj_pos">
-        <dia:point val="25.8242,9.26191"/>
+        <dia:point val="26,6.77782"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.5948,9.21159;25.8746,9.36512"/>
+        <dia:rectangle val="17.9301,0.830102;26.0699,6.84772"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="25.8242,9.26191"/>
-        <dia:point val="17.6452,9.3148"/>
+        <dia:point val="26,6.77782"/>
+        <dia:point val="18,0.9"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O20" connection="3"/>
-        <dia:connection handle="1" to="O8" connection="4"/>
+        <dia:connection handle="0" to="O18" connection="3"/>
+        <dia:connection handle="1" to="O7" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O39">
+    <dia:object type="Standard - Line" version="0" id="O36">
       <dia:attribute name="obj_pos">
         <dia:point val="38.1986,8.83765"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.4488,8.78527;38.251,9.31429"/>
+        <dia:rectangle val="29.6167,6.71747;38.2589,8.898"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="38.1986,8.83765"/>
-        <dia:point val="29.5012,9.26191"/>
+        <dia:point val="29.677,6.77782"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O19" connection="3"/>
-        <dia:connection handle="1" to="O20" connection="7"/>
+        <dia:connection handle="0" to="O17" connection="3"/>
+        <dia:connection handle="1" to="O18" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O40">
+    <dia:object type="Standard - Line" version="0" id="O37">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.9564,2.43368"/>
+        <dia:point val="40,1.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.9057,2.38297;40.0878,8.11054"/>
+        <dia:rectangle val="39.9497,1.7497;40.0874,8.11013"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="39.9564,2.43368"/>
+        <dia:point val="40,1.8"/>
         <dia:point val="40.0371,8.05983"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O12" connection="6"/>
-        <dia:connection handle="1" to="O19" connection="1"/>
+        <dia:connection handle="0" to="O10" connection="6"/>
+        <dia:connection handle="1" to="O17" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O41">
+    <dia:object type="Standard - Line" version="0" id="O38">
       <dia:attribute name="obj_pos">
         <dia:point val="29.3598,1.13018"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.3075,1.07789;38.0087,1.58597"/>
+        <dia:rectangle val="29.3085,0.848686;38.0513,1.18149"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="29.3598,1.13018"/>
-        <dia:point val="37.9564,1.53368"/>
+        <dia:point val="38,0.9"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O18" connection="7"/>
-        <dia:connection handle="1" to="O12" connection="3"/>
+        <dia:connection handle="0" to="O16" connection="7"/>
+        <dia:connection handle="1" to="O10" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O42">
+    <dia:object type="Standard - Line" version="0" id="O39">
       <dia:attribute name="obj_pos">
-        <dia:point val="21.3937,-3.25698"/>
+        <dia:point val="19.3937,-3.25698"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.323,-3.32769;25.7535,1.20089"/>
+        <dia:rectangle val="19.3241,-3.32659;25.7524,1.19979"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="21.3937,-3.25698"/>
+        <dia:point val="19.3937,-3.25698"/>
         <dia:point val="25.6828,1.13018"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O6" connection="7"/>
-        <dia:connection handle="1" to="O18" connection="3"/>
+        <dia:connection handle="0" to="O5" connection="6"/>
+        <dia:connection handle="1" to="O16" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O43">
+    <dia:object type="Standard - Line" version="0" id="O40">
       <dia:attribute name="obj_pos">
         <dia:point val="27.3799,-6.36515"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.3342,-6.42467;27.4394,-4.99746"/>
+        <dia:rectangle val="19.3363,-6.42257;27.4373,-4.99956"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="27.3799,-6.36515"/>
-        <dia:point val="21.3937,-5.05698"/>
+        <dia:point val="19.3937,-5.05698"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O17" connection="3"/>
-        <dia:connection handle="1" to="O6" connection="2"/>
+        <dia:connection handle="0" to="O15" connection="3"/>
+        <dia:connection handle="1" to="O5" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O44">
+    <dia:object type="Standard - Line" version="0" id="O41">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.9564,0.63368"/>
+        <dia:point val="40,0"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.9866,-6.43536;40.0266,0.70389"/>
+        <dia:rectangle val="30.9871,-6.43488;40.0697,0.0697288"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="39.9564,0.63368"/>
+        <dia:point val="40,0"/>
         <dia:point val="31.0568,-6.36515"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O12" connection="1"/>
-        <dia:connection handle="1" to="O17" connection="7"/>
+        <dia:connection handle="0" to="O10" connection="1"/>
+        <dia:connection handle="1" to="O15" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O45">
+    <dia:object type="Standard - Line" version="0" id="O42">
       <dia:attribute name="obj_pos">
         <dia:point val="46.9667,3.74648"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="41.8905,1.46774;47.0327,3.81242"/>
+        <dia:rectangle val="41.9318,0.831757;47.0349,3.81472"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="46.9667,3.74648"/>
-        <dia:point val="41.9564,1.53368"/>
+        <dia:point val="42,0.9"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O16" connection="3"/>
-        <dia:connection handle="1" to="O12" connection="4"/>
+        <dia:connection handle="0" to="O14" connection="3"/>
+        <dia:connection handle="1" to="O10" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O46">
+    <dia:object type="Standard - Line" version="0" id="O43">
       <dia:attribute name="obj_pos">
-        <dia:point val="48.5747,-2.12612"/>
+        <dia:point val="48.8747,-1.87612"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="48.5224,-2.17833;48.8574,3.02087"/>
+        <dia:rectangle val="48.7545,-1.92683;48.9254,3.01937"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="48.5747,-2.12612"/>
+        <dia:point val="48.8747,-1.87612"/>
         <dia:point val="48.8052,2.96866"/>
       </dia:attribute>
       <dia:attribute name="numcp">
@@ -1631,91 +1540,91 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O2" connection="6"/>
-        <dia:connection handle="1" to="O16" connection="1"/>
+        <dia:connection handle="1" to="O14" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O47">
+    <dia:object type="Standard - Line" version="0" id="O44">
       <dia:attribute name="obj_pos">
-        <dia:point val="46.6785,12.5494"/>
+        <dia:point val="48.6785,12.5494"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="41.8054,8.76751;46.7486,12.6195"/>
+        <dia:rectangle val="41.8078,8.76981;48.7463,12.6172"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="46.6785,12.5494"/>
+        <dia:point val="48.6785,12.5494"/>
         <dia:point val="41.8756,8.83765"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O7" connection="0"/>
-        <dia:connection handle="1" to="O19" connection="7"/>
+        <dia:connection handle="0" to="O6" connection="1"/>
+        <dia:connection handle="1" to="O17" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O48">
+    <dia:object type="Standard - Line" version="0" id="O45">
       <dia:attribute name="obj_pos">
-        <dia:point val="46.6785,14.3494"/>
+        <dia:point val="46.6785,13.4494"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.7014,14.2969;46.7309,15.1127"/>
+        <dia:rectangle val="32.6214,11.7222;46.7341,13.505"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="46.6785,14.3494"/>
-        <dia:point val="32.7539,15.0602"/>
+        <dia:point val="46.6785,13.4494"/>
+        <dia:point val="32.677,11.7778"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O7" connection="5"/>
-        <dia:connection handle="1" to="O14" connection="7"/>
+        <dia:connection handle="0" to="O6" connection="3"/>
+        <dia:connection handle="1" to="O12" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O49">
+    <dia:object type="Standard - Line" version="0" id="O46">
       <dia:attribute name="obj_pos">
-        <dia:point val="29.0769,15.0602"/>
+        <dia:point val="29,11.7778"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.3275,15.0023;29.1348,16.9901"/>
+        <dia:rectangle val="14.6634,9.59399;29.0568,11.8346"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="29.0769,15.0602"/>
-        <dia:point val="18.3854,16.9322"/>
+        <dia:point val="29,11.7778"/>
+        <dia:point val="14.7202,9.65081"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O14" connection="3"/>
-        <dia:connection handle="1" to="O3" connection="4"/>
+        <dia:connection handle="0" to="O12" connection="3"/>
+        <dia:connection handle="1" to="O79" connection="2"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O50">
+    <dia:object type="Standard - Line" version="0" id="O47">
       <dia:attribute name="obj_pos">
-        <dia:point val="29.6426,19.9392"/>
+        <dia:point val="28,16.7778"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.5748,10.1445;29.7129,20.0095"/>
+        <dia:rectangle val="15.9297,1.72972;28.0703,16.8481"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="29.6426,19.9392"/>
-        <dia:point val="17.6452,10.2148"/>
+        <dia:point val="28,16.7778"/>
+        <dia:point val="16,1.8"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O15" connection="3"/>
-        <dia:connection handle="1" to="O8" connection="7"/>
+        <dia:connection handle="0" to="O13" connection="3"/>
+        <dia:connection handle="1" to="O7" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O51">
+    <dia:object type="Standard - Text" version="0" id="O48">
       <dia:attribute name="obj_pos">
-        <dia:point val="37.9204,28.0896"/>
+        <dia:point val="39,22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.9204,27.4696;39.1404,28.5296"/>
+        <dia:rectangle val="39,21.4;40.45,22.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1729,7 +1638,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="37.9204,28.0896"/>
+            <dia:point val="39,22"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1740,12 +1649,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O52">
+    <dia:object type="Standard - Text" version="0" id="O49">
       <dia:attribute name="obj_pos">
-        <dia:point val="17.5361,28.0214"/>
+        <dia:point val="22,18"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.5161,27.4014;18.7361,28.4614"/>
+        <dia:rectangle val="22,17.4;23.45,18.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1759,7 +1668,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="17.5361,28.0214"/>
+            <dia:point val="22,18"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1770,12 +1679,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O53">
+    <dia:object type="Standard - Text" version="0" id="O50">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.35936,5.33843"/>
+        <dia:point val="4,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.35936,4.71843;5.57936,5.77843"/>
+        <dia:rectangle val="4,0.4;5.45,1.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1789,7 +1698,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.35936,5.33843"/>
+            <dia:point val="4,1"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1800,12 +1709,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O54">
+    <dia:object type="Standard - Text" version="0" id="O51">
       <dia:attribute name="obj_pos">
-        <dia:point val="33.4707,14.4778"/>
+        <dia:point val="33,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.4507,13.8578;34.6707,14.9178"/>
+        <dia:rectangle val="33,10.4;34.45,11.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1819,7 +1728,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="33.4707,14.4778"/>
+            <dia:point val="33,11"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1830,12 +1739,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O55">
+    <dia:object type="Standard - Text" version="0" id="O52">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.8142,19.2154"/>
+        <dia:point val="33,16"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.7942,18.5954;36.0142,19.6554"/>
+        <dia:rectangle val="33,15.4;34.45,16.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1849,7 +1758,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="34.8142,19.2154"/>
+            <dia:point val="33,16"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1860,12 +1769,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O56">
+    <dia:object type="Standard - Text" version="0" id="O53">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.75301,19.074"/>
+        <dia:point val="6,19"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.75301,18.454;3.97301,19.514"/>
+        <dia:rectangle val="6,18.4;7.45,19.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1879,7 +1788,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="2.75301,19.074"/>
+            <dia:point val="6,19"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1890,31 +1799,31 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O57">
+    <dia:object type="Standard - Line" version="0" id="O54">
       <dia:attribute name="obj_pos">
-        <dia:point val="43.1426,18.0767"/>
+        <dia:point val="41,15.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.1841,18.0175;43.2017,19.9984"/>
+        <dia:rectangle val="32.5458,15.8451;41.0549,16.8327"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="43.1426,18.0767"/>
-        <dia:point val="34.2433,19.9392"/>
+        <dia:point val="41,15.9"/>
+        <dia:point val="32.6007,16.7778"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O4" connection="3"/>
-        <dia:connection handle="1" to="O15" connection="7"/>
+        <dia:connection handle="0" to="O3" connection="3"/>
+        <dia:connection handle="1" to="O13" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O58">
+    <dia:object type="Standard - Text" version="0" id="O55">
       <dia:attribute name="obj_pos">
         <dia:point val="29.5321,0.6422"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.5321,0.0221997;30.7521,1.0822"/>
+        <dia:rectangle val="29.5321,0.0422;30.9821,0.9922"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1939,12 +1848,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O59">
+    <dia:object type="Standard - Text" version="0" id="O56">
       <dia:attribute name="obj_pos">
         <dia:point val="31.0568,-6.36515"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.0568,-6.98515;32.2768,-5.92515"/>
+        <dia:rectangle val="31.0568,-6.96515;32.5068,-6.01515"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1969,15 +1878,15 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O17" connection="7"/>
+        <dia:connection handle="0" to="O15" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O60">
+    <dia:object type="Standard - Text" version="0" id="O57">
       <dia:attribute name="obj_pos">
         <dia:point val="45.4208,4.26009"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="45.4208,3.64009;46.6408,4.70009"/>
+        <dia:rectangle val="45.4208,3.66009;46.8708,4.61009"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2002,12 +1911,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O61">
+    <dia:object type="Standard - Text" version="0" id="O58">
       <dia:attribute name="obj_pos">
         <dia:point val="42.3308,8.89767"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="42.3308,8.27767;43.5508,9.33767"/>
+        <dia:rectangle val="42.3308,8.29767;43.7808,9.24767"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2032,12 +1941,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O62">
+    <dia:object type="Standard - Text" version="0" id="O59">
       <dia:attribute name="obj_pos">
-        <dia:point val="24.7026,8.52041"/>
+        <dia:point val="24,7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.7026,7.92041;25.9026,8.92041"/>
+        <dia:rectangle val="24,6.4;25.45,7.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2051,7 +1960,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="24.7026,8.52041"/>
+            <dia:point val="24,7"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2062,12 +1971,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O63">
+    <dia:object type="Standard - Text" version="0" id="O60">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.7636,26.2688"/>
+        <dia:point val="33,23"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.7636,25.6488;33.9836,26.7088"/>
+        <dia:rectangle val="33,22.4;34.45,23.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2081,7 +1990,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="32.7636,26.2688"/>
+            <dia:point val="33,23"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2092,12 +2001,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O64">
+    <dia:object type="Standard - Text" version="0" id="O61">
       <dia:attribute name="obj_pos">
-        <dia:point val="17.5113,30.27"/>
+        <dia:point val="21,20"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.5113,29.65;18.7313,30.71"/>
+        <dia:rectangle val="21,19.4;22.45,20.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2111,7 +2020,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="17.5113,30.27"/>
+            <dia:point val="21,20"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2122,12 +2031,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O65">
+    <dia:object type="Standard - Text" version="0" id="O62">
       <dia:attribute name="obj_pos">
-        <dia:point val="6.41997,6.4698"/>
+        <dia:point val="6,2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.41997,5.8498;7.63997,6.9098"/>
+        <dia:rectangle val="6,1.4;7.45,2.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2141,7 +2050,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="6.41997,6.4698"/>
+            <dia:point val="6,2"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2152,12 +2061,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O66">
+    <dia:object type="Standard - Text" version="0" id="O63">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.905,21.6726"/>
+        <dia:point val="32.3,18.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.905,21.0726;34.105,22.0726"/>
+        <dia:rectangle val="32.3,18.1812;33.7688,19.1875"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2171,7 +2080,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="32.905,21.6726"/>
+            <dia:point val="32.3,18.8"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2182,12 +2091,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O67">
+    <dia:object type="Standard - Text" version="0" id="O64">
       <dia:attribute name="obj_pos">
-        <dia:point val="49.6635,2.36858"/>
+        <dia:point val="49,2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="49.6435,1.74858;50.8635,2.80858"/>
+        <dia:rectangle val="49,1.4;50.45,2.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2201,7 +2110,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="49.6635,2.36858"/>
+            <dia:point val="49,2"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2212,12 +2121,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O68">
+    <dia:object type="Standard - Text" version="0" id="O65">
       <dia:attribute name="obj_pos">
         <dia:point val="23.946,1.70286"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="23.946,1.08286;25.166,2.14286"/>
+        <dia:rectangle val="23.946,1.10286;25.396,2.05286"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2242,12 +2151,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O69">
+    <dia:object type="Standard - Text" version="0" id="O66">
       <dia:attribute name="obj_pos">
         <dia:point val="26.138,-6.44655"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.138,-7.06655;27.358,-6.00655"/>
+        <dia:rectangle val="26.138,-7.04655;27.588,-6.09655"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2272,12 +2181,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O70">
+    <dia:object type="Standard - Text" version="0" id="O67">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.6222,30.6235"/>
+        <dia:point val="16,20"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.6222,30.0035;14.8422,31.0635"/>
+        <dia:rectangle val="16,19.4;17.45,20.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2291,7 +2200,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="13.6222,30.6235"/>
+            <dia:point val="16,20"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2302,12 +2211,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O71">
+    <dia:object type="Standard - Text" version="0" id="O68">
       <dia:attribute name="obj_pos">
-        <dia:point val="6.05642,18.4613"/>
+        <dia:point val="5,16"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.05642,17.8413;7.27642,18.9013"/>
+        <dia:rectangle val="5,15.4;6.45,16.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2321,7 +2230,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="6.05642,18.4613"/>
+            <dia:point val="5,16"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2332,12 +2241,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O72">
+    <dia:object type="Standard - Text" version="0" id="O69">
       <dia:attribute name="obj_pos">
-        <dia:point val="27.6937,20.2998"/>
+        <dia:point val="26,17"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.6937,19.6798;28.9137,20.7398"/>
+        <dia:rectangle val="26,16.4;27.45,17.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2351,7 +2260,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="27.6937,20.2998"/>
+            <dia:point val="26,17"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2362,12 +2271,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O73">
+    <dia:object type="Standard - Text" version="0" id="O70">
       <dia:attribute name="obj_pos">
-        <dia:point val="12.4697,27.6123"/>
+        <dia:point val="15,17"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.4697,26.9923;13.6897,28.0523"/>
+        <dia:rectangle val="15,16.4;16.45,17.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2381,7 +2290,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="12.4697,27.6123"/>
+            <dia:point val="15,17"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2392,12 +2301,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O74">
+    <dia:object type="Standard - Text" version="0" id="O71">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.40078,16.1278"/>
+        <dia:point val="2,16"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.40078,15.5078;5.82078,16.5678"/>
+        <dia:rectangle val="2,15.4;3.6,16.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2411,7 +2320,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.40078,16.1278"/>
+            <dia:point val="2,16"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2422,12 +2331,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O75">
+    <dia:object type="Standard - Text" version="0" id="O72">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.42088,7.9254"/>
+        <dia:point val="2,5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.42088,7.3054;3.84088,8.3654"/>
+        <dia:rectangle val="2,4.4;3.6,5.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2441,7 +2350,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="2.42088,7.9254"/>
+            <dia:point val="2,5"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2452,12 +2361,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O76">
+    <dia:object type="Standard - Text" version="0" id="O73">
       <dia:attribute name="obj_pos">
-        <dia:point val="29.9564,8.49108"/>
+        <dia:point val="30,6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.9564,7.87108;31.3764,8.93108"/>
+        <dia:rectangle val="30,5.4;31.6,6.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2471,7 +2380,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="29.9564,8.49108"/>
+            <dia:point val="30,6"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2482,12 +2391,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O77">
+    <dia:object type="Standard - Text" version="0" id="O74">
       <dia:attribute name="obj_pos">
         <dia:point val="36.6739,8.27895"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.6739,7.65895;38.0939,8.71895"/>
+        <dia:rectangle val="36.6739,7.67895;38.2739,8.62895"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2512,12 +2421,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O78">
+    <dia:object type="Standard - Text" version="0" id="O75">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.99571,7.8133"/>
+        <dia:point val="6,4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.99571,7.1933;7.21571,8.2533"/>
+        <dia:rectangle val="6,3.4;7.45,4.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2531,7 +2440,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="5.99571,7.8133"/>
+            <dia:point val="6,4"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2542,12 +2451,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O79">
+    <dia:object type="Standard - Text" version="0" id="O76">
       <dia:attribute name="obj_pos">
-        <dia:point val="27.7644,14.7136"/>
+        <dia:point val="27,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.7644,14.0936;28.9844,15.1536"/>
+        <dia:rectangle val="27,10.4;28.45,11.35"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2561,7 +2470,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="27.7644,14.7136"/>
+            <dia:point val="27,11"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -2572,12 +2481,12 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="0" id="O80">
+    <dia:object type="Standard - Text" version="0" id="O77">
       <dia:attribute name="obj_pos">
         <dia:point val="40.6125,7.60117"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="40.6125,7.00117;41.8125,8.00117"/>
+        <dia:rectangle val="40.6125,7.00117;42.0625,7.95117"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -2602,5 +2511,127 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
+    <dia:object type="Network - Cloud" version="0" id="O78">
+      <dia:attribute name="obj_pos">
+        <dia:point val="44.1421,19.462"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="44.1421,19.462;50.1679,22.7069"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="44.1421,19.462"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="6.0257678032051603"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="3.2449053553832456"/>
+      </dia:attribute>
+      <dia:attribute name="line_width">
+        <dia:real val="0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_colour">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="show_background">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="line_style">
+        <dia:enum val="0"/>
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#Internet#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="47.3165,21.3417"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="flip_horizontal">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="flip_vertical">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Network - Cloud" version="0" id="O79">
+      <dia:attribute name="obj_pos">
+        <dia:point val="10.7487,8.31203"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="10.7487,8.31203;14.8613,11.5569"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="10.7487,8.31203"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="4.1125981924267183"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="3.2449053553832439"/>
+      </dia:attribute>
+      <dia:attribute name="line_width">
+        <dia:real val="0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_colour">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="show_background">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="line_style">
+        <dia:enum val="0"/>
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#X.25#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="12.9152,10.1917"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="flip_horizontal">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="flip_vertical">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+    </dia:object>
   </dia:layer>
 </dia:diagram>