Index: diagrams/community-network-integration,1.dia
==================================================================
--- diagrams/community-network-integration,1.dia
+++ diagrams/community-network-integration,1.dia
@@ -62,576 +62,11 @@
       </dia:composite>
     </dia:attribute>
   </dia:diagramdata>
   <dia:layer name="Background" visible="true" active="true">
     <dia:group>
-      <dia:object type="Cisco - Branch office" version="1" id="O0">
-        <dia:attribute name="obj_pos">
-          <dia:point val="12.5769,2"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="12.5751,1.99925;16.3386,6.89736"/>
-        </dia:attribute>
-        <dia:attribute name="meta">
-          <dia:composite type="dict"/>
-        </dia:attribute>
-        <dia:attribute name="elem_corner">
-          <dia:point val="12.5769,2"/>
-        </dia:attribute>
-        <dia:attribute name="elem_width">
-          <dia:real val="3.7598838050470751"/>
-        </dia:attribute>
-        <dia:attribute name="elem_height">
-          <dia:real val="4.8955020258754756"/>
-        </dia:attribute>
-        <dia:attribute name="line_width">
-          <dia:real val="0.15000000000000002"/>
-        </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="flip_horizontal">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="flip_vertical">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="subscale">
-          <dia:real val="1"/>
-        </dia:attribute>
-      </dia:object>
-      <dia:object type="Cisco - Generic Building" version="1" id="O1">
-        <dia:attribute name="obj_pos">
-          <dia:point val="4.04402,3.9"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="4.04221,3.89925;9.60854,12.4488"/>
-        </dia:attribute>
-        <dia:attribute name="meta">
-          <dia:composite type="dict"/>
-        </dia:attribute>
-        <dia:attribute name="elem_corner">
-          <dia:point val="4.04402,3.9"/>
-        </dia:attribute>
-        <dia:attribute name="elem_width">
-          <dia:real val="5.5637747385789851"/>
-        </dia:attribute>
-        <dia:attribute name="elem_height">
-          <dia:real val="8.5469256114553342"/>
-        </dia:attribute>
-        <dia:attribute name="line_width">
-          <dia:real val="0.15000000000000002"/>
-        </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="flip_horizontal">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="flip_vertical">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="subscale">
-          <dia:real val="1"/>
-        </dia:attribute>
-      </dia:object>
-      <dia:object type="Cisco - Branch office subdued" version="1" id="O2">
-        <dia:attribute name="obj_pos">
-          <dia:point val="10.1418,9.23071"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="10.14,9.22996;14.1729,14.4777"/>
-        </dia:attribute>
-        <dia:attribute name="meta">
-          <dia:composite type="dict"/>
-        </dia:attribute>
-        <dia:attribute name="elem_corner">
-          <dia:point val="10.1418,9.23071"/>
-        </dia:attribute>
-        <dia:attribute name="elem_width">
-          <dia:real val="4.0292525920005025"/>
-        </dia:attribute>
-        <dia:attribute name="elem_height">
-          <dia:real val="5.2450817658229738"/>
-        </dia:attribute>
-        <dia:attribute name="line_width">
-          <dia:real val="0.15000000000000002"/>
-        </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="flip_horizontal">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="flip_vertical">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="subscale">
-          <dia:real val="1"/>
-        </dia:attribute>
-      </dia:object>
-      <dia:object type="Cisco - Branch office subdued" version="1" id="O3">
-        <dia:attribute name="obj_pos">
-          <dia:point val="-0.0731838,9.25001"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="-0.075,9.24926;3.95789,14.497"/>
-        </dia:attribute>
-        <dia:attribute name="meta">
-          <dia:composite type="dict"/>
-        </dia:attribute>
-        <dia:attribute name="elem_corner">
-          <dia:point val="-0.0731838,9.25001"/>
-        </dia:attribute>
-        <dia:attribute name="elem_width">
-          <dia:real val="4.0292525920005025"/>
-        </dia:attribute>
-        <dia:attribute name="elem_height">
-          <dia:real val="5.2450817658229738"/>
-        </dia:attribute>
-        <dia:attribute name="line_width">
-          <dia:real val="0.15000000000000002"/>
-        </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="flip_horizontal">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="flip_vertical">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="subscale">
-          <dia:real val="1"/>
-        </dia:attribute>
-      </dia:object>
-      <dia:object type="Cisco - Wireless router" version="1" id="O4">
-        <dia:attribute name="obj_pos">
-          <dia:point val="5.91902,2.6286"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="4.91902,2.5286;8.83998,4.58442"/>
-        </dia:attribute>
-        <dia:attribute name="meta">
-          <dia:composite type="dict"/>
-        </dia:attribute>
-        <dia:attribute name="elem_corner">
-          <dia:point val="5.91902,2.6286"/>
-        </dia:attribute>
-        <dia:attribute name="elem_width">
-          <dia:real val="1.9209630350194509"/>
-        </dia:attribute>
-        <dia:attribute name="elem_height">
-          <dia:real val="1.9058184264897757"/>
-        </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="flip_horizontal">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="flip_vertical">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="subscale">
-          <dia:real val="1"/>
-        </dia:attribute>
-      </dia:object>
-      <dia:object type="Cisco - Wireless router" version="1" id="O5">
-        <dia:attribute name="obj_pos">
-          <dia:point val="1.17342,7.95001"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="0.173416,7.85001;4.09438,9.90583"/>
-        </dia:attribute>
-        <dia:attribute name="meta">
-          <dia:composite type="dict"/>
-        </dia:attribute>
-        <dia:attribute name="elem_corner">
-          <dia:point val="1.17342,7.95001"/>
-        </dia:attribute>
-        <dia:attribute name="elem_width">
-          <dia:real val="1.9209630350194509"/>
-        </dia:attribute>
-        <dia:attribute name="elem_height">
-          <dia:real val="1.9058184264897757"/>
-        </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="flip_horizontal">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="flip_vertical">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="subscale">
-          <dia:real val="1"/>
-        </dia:attribute>
-      </dia:object>
-      <dia:object type="Cisco - Wireless router" version="1" id="O6">
-        <dia:attribute name="obj_pos">
-          <dia:point val="13.5734,0.75"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="12.5734,0.65;16.4944,2.70582"/>
-        </dia:attribute>
-        <dia:attribute name="meta">
-          <dia:composite type="dict"/>
-        </dia:attribute>
-        <dia:attribute name="elem_corner">
-          <dia:point val="13.5734,0.75"/>
-        </dia:attribute>
-        <dia:attribute name="elem_width">
-          <dia:real val="1.920963035019452"/>
-        </dia:attribute>
-        <dia:attribute name="elem_height">
-          <dia:real val="1.9058184264897768"/>
-        </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="flip_horizontal">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="flip_vertical">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="subscale">
-          <dia:real val="1"/>
-        </dia:attribute>
-      </dia:object>
-      <dia:object type="Standard - Line" version="0" id="O7">
-        <dia:attribute name="obj_pos">
-          <dia:point val="7.83998,3.88733"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="7.74605,2.02037;13.617,3.98126"/>
-        </dia:attribute>
-        <dia:attribute name="conn_endpoints">
-          <dia:point val="7.83998,3.88733"/>
-          <dia:point val="13.5231,2.1143"/>
-        </dia:attribute>
-        <dia:attribute name="numcp">
-          <dia:int val="1"/>
-        </dia:attribute>
-        <dia:attribute name="line_color">
-          <dia:color val="#00ff00"/>
-        </dia:attribute>
-        <dia:attribute name="line_width">
-          <dia:real val="0.15000000000000002"/>
-        </dia:attribute>
-        <dia:connections>
-          <dia:connection handle="0" to="O4" connection="8"/>
-          <dia:connection handle="1" to="O6" connection="9"/>
-        </dia:connections>
-      </dia:object>
-      <dia:object type="Standard - Line" version="0" id="O8">
-        <dia:attribute name="obj_pos">
-          <dia:point val="7.83998,4.16087"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="7.73407,4.05496;11.9018,8.68084"/>
-        </dia:attribute>
-        <dia:attribute name="conn_endpoints">
-          <dia:point val="7.83998,4.16087"/>
-          <dia:point val="11.7959,8.57493"/>
-        </dia:attribute>
-        <dia:attribute name="numcp">
-          <dia:int val="1"/>
-        </dia:attribute>
-        <dia:attribute name="line_color">
-          <dia:color val="#00ff00"/>
-        </dia:attribute>
-        <dia:attribute name="line_width">
-          <dia:real val="0.15000000000000002"/>
-        </dia:attribute>
-        <dia:connections>
-          <dia:connection handle="0" to="O4" connection="7"/>
-          <dia:connection handle="1" to="O14" connection="9"/>
-        </dia:connections>
-      </dia:object>
-      <dia:object type="Standard - Line" version="0" id="O9">
-        <dia:attribute name="obj_pos">
-          <dia:point val="3.14403,9.00092"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="3.06903,8.92592;11.2485,9.07592"/>
-        </dia:attribute>
-        <dia:attribute name="conn_endpoints">
-          <dia:point val="3.14403,9.00092"/>
-          <dia:point val="11.1735,9.00092"/>
-        </dia:attribute>
-        <dia:attribute name="numcp">
-          <dia:int val="1"/>
-        </dia:attribute>
-        <dia:attribute name="line_color">
-          <dia:color val="#00ff00"/>
-        </dia:attribute>
-        <dia:attribute name="line_width">
-          <dia:real val="0.15000000000000002"/>
-        </dia:attribute>
-        <dia:connections>
-          <dia:connection handle="0" to="O5" connection="9"/>
-          <dia:connection handle="1" to="O14" connection="9"/>
-        </dia:connections>
-      </dia:object>
-      <dia:object type="Standard - Line" version="0" id="O10">
-        <dia:attribute name="obj_pos">
-          <dia:point val="2.81789,8.2269"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="2.712,4.35961;6.27816,8.33279"/>
-        </dia:attribute>
-        <dia:attribute name="conn_endpoints">
-          <dia:point val="2.81789,8.2269"/>
-          <dia:point val="6.17227,4.46551"/>
-        </dia:attribute>
-        <dia:attribute name="numcp">
-          <dia:int val="1"/>
-        </dia:attribute>
-        <dia:attribute name="line_color">
-          <dia:color val="#00ff00"/>
-        </dia:attribute>
-        <dia:attribute name="line_width">
-          <dia:real val="0.15000000000000002"/>
-        </dia:attribute>
-        <dia:connections>
-          <dia:connection handle="0" to="O5" connection="9"/>
-          <dia:connection handle="1" to="O4" connection="9"/>
-        </dia:connections>
-      </dia:object>
-      <dia:object type="Cisco - Cloud Gold" version="1" id="O11">
-        <dia:attribute name="obj_pos">
-          <dia:point val="16.6285,2.52"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="16.6278,2.51925;25.7293,10.5708"/>
-        </dia:attribute>
-        <dia:attribute name="meta">
-          <dia:composite type="dict"/>
-        </dia:attribute>
-        <dia:attribute name="elem_corner">
-          <dia:point val="16.6285,2.52"/>
-        </dia:attribute>
-        <dia:attribute name="elem_width">
-          <dia:real val="9.1000000000000014"/>
-        </dia:attribute>
-        <dia:attribute name="elem_height">
-          <dia:real val="8.0500000000000007"/>
-        </dia:attribute>
-        <dia:attribute name="line_width">
-          <dia:real val="0.15000000000000002"/>
-        </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="flip_horizontal">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="flip_vertical">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="subscale">
-          <dia:real val="1"/>
-        </dia:attribute>
-      </dia:object>
-      <dia:object type="Standard - Text" version="1" id="O12">
-        <dia:attribute name="obj_pos">
-          <dia:point val="17.7103,6.34691"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="17.7103,5.75191;24.2878,6.49691"/>
-        </dia:attribute>
-        <dia:attribute name="text">
-          <dia:composite type="text">
-            <dia:attribute name="string">
-              <dia:string>#Community Network#</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="17.7103,6.34691"/>
-            </dia:attribute>
-            <dia:attribute name="color">
-              <dia:color val="#000000"/>
-            </dia:attribute>
-            <dia:attribute name="alignment">
-              <dia:enum val="0"/>
-            </dia:attribute>
-          </dia:composite>
-        </dia:attribute>
-        <dia:attribute name="valign">
-          <dia:enum val="3"/>
-        </dia:attribute>
-      </dia:object>
-      <dia:object type="Standard - Line" version="0" id="O13">
-        <dia:attribute name="obj_pos">
-          <dia:point val="15.462,2.44256"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="15.3577,2.33828;17.9449,4.18026"/>
-        </dia:attribute>
-        <dia:attribute name="conn_endpoints">
-          <dia:point val="15.462,2.44256"/>
-          <dia:point val="17.8406,4.07598"/>
-        </dia:attribute>
-        <dia:attribute name="numcp">
-          <dia:int val="1"/>
-        </dia:attribute>
-        <dia:attribute name="line_color">
-          <dia:color val="#00ff00"/>
-        </dia:attribute>
-        <dia:attribute name="line_width">
-          <dia:real val="0.15000000000000002"/>
-        </dia:attribute>
-        <dia:connections>
-          <dia:connection handle="0" to="O6" connection="9"/>
-          <dia:connection handle="1" to="O11" connection="14"/>
-        </dia:connections>
-      </dia:object>
-      <dia:object type="Cisco - Wireless router" version="1" id="O14">
-        <dia:attribute name="obj_pos">
-          <dia:point val="11.2234,7.95001"/>
-        </dia:attribute>
-        <dia:attribute name="obj_bb">
-          <dia:rectangle val="10.2234,7.85001;14.1444,9.90583"/>
-        </dia:attribute>
-        <dia:attribute name="meta">
-          <dia:composite type="dict"/>
-        </dia:attribute>
-        <dia:attribute name="elem_corner">
-          <dia:point val="11.2234,7.95001"/>
-        </dia:attribute>
-        <dia:attribute name="elem_width">
-          <dia:real val="1.9209630350194509"/>
-        </dia:attribute>
-        <dia:attribute name="elem_height">
-          <dia:real val="1.9058184264897757"/>
-        </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="flip_horizontal">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="flip_vertical">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="subscale">
-          <dia:real val="1"/>
-        </dia:attribute>
-      </dia:object>
-    </dia:group>
-    <dia:group>
-      <dia:object type="Standard - Box" version="0" id="O15">
+      <dia:object type="Standard - Box" version="0" id="O0">
         <dia:attribute name="obj_pos">
           <dia:point val="29.0365,2"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
           <dia:rectangle val="28.9615,1.925;45.1524,14.075"/>
@@ -650,16 +85,16 @@
         </dia:attribute>
         <dia:attribute name="show_background">
           <dia:boolean val="true"/>
         </dia:attribute>
       </dia:object>
-      <dia:object type="Cisco - Switch Processor" version="1" id="O16">
+      <dia:object type="Cisco - Switch Processor" version="1" id="O1">
         <dia:attribute name="obj_pos">
           <dia:point val="29.8853,2.5817"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="29.8814,2.57997;32.8488,4.30665"/>
+          <dia:rectangle val="29.8815,2.57997;32.8488,4.30665"/>
         </dia:attribute>
         <dia:attribute name="meta">
           <dia:composite type="dict"/>
         </dia:attribute>
         <dia:attribute name="elem_corner">
@@ -695,16 +130,16 @@
         </dia:attribute>
         <dia:attribute name="subscale">
           <dia:real val="1"/>
         </dia:attribute>
       </dia:object>
-      <dia:object type="Cisco - Wireless router" version="1" id="O17">
+      <dia:object type="Cisco - Wireless router" version="1" id="O2">
         <dia:attribute name="obj_pos">
           <dia:point val="30.4815,7.78"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="29.4815,7.68;33.4024,9.73582"/>
+          <dia:rectangle val="29.4815,7.68;33.4025,9.73582"/>
         </dia:attribute>
         <dia:attribute name="meta">
           <dia:composite type="dict"/>
         </dia:attribute>
         <dia:attribute name="elem_corner">
@@ -740,16 +175,16 @@
         </dia:attribute>
         <dia:attribute name="subscale">
           <dia:real val="1"/>
         </dia:attribute>
       </dia:object>
-      <dia:object type="Standard - Line" version="0" id="O18">
+      <dia:object type="Standard - Line" version="0" id="O3">
         <dia:attribute name="obj_pos">
           <dia:point val="29.9566,12.7973"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="29.8815,12.7222;33.0307,12.8751"/>
+          <dia:rectangle val="29.8815,12.7222;33.0308,12.8751"/>
         </dia:attribute>
         <dia:attribute name="conn_endpoints">
           <dia:point val="29.9566,12.7973"/>
           <dia:point val="32.9557,12.8"/>
         </dia:attribute>
@@ -761,11 +196,11 @@
         </dia:attribute>
         <dia:attribute name="line_width">
           <dia:real val="0.15000000000000002"/>
         </dia:attribute>
       </dia:object>
-      <dia:object type="Standard - Line" version="0" id="O19">
+      <dia:object type="Standard - Line" version="0" id="O4">
         <dia:attribute name="obj_pos">
           <dia:point val="29.9565,10.75"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
           <dia:rectangle val="29.8815,10.675;32.981,10.825"/>
@@ -779,11 +214,11 @@
         </dia:attribute>
         <dia:attribute name="line_width">
           <dia:real val="0.15000000000000002"/>
         </dia:attribute>
       </dia:object>
-      <dia:object type="Standard - Text" version="1" id="O20">
+      <dia:object type="Standard - Text" version="1" id="O5">
         <dia:attribute name="obj_pos">
           <dia:point val="35.1865,3.6"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
           <dia:rectangle val="35.1865,3.005;40.434,3.75"/>
@@ -812,11 +247,11 @@
         </dia:attribute>
         <dia:attribute name="valign">
           <dia:enum val="3"/>
         </dia:attribute>
       </dia:object>
-      <dia:object type="Standard - Text" version="1" id="O21">
+      <dia:object type="Standard - Text" version="1" id="O6">
         <dia:attribute name="obj_pos">
           <dia:point val="35.1865,8.8125"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
           <dia:rectangle val="35.1865,8.2175;41.199,8.9625"/>
@@ -845,11 +280,11 @@
         </dia:attribute>
         <dia:attribute name="valign">
           <dia:enum val="3"/>
         </dia:attribute>
       </dia:object>
-      <dia:object type="Standard - Text" version="1" id="O22">
+      <dia:object type="Standard - Text" version="1" id="O7">
         <dia:attribute name="obj_pos">
           <dia:point val="35.1865,10.825"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
           <dia:rectangle val="35.1865,10.23;41.674,10.975"/>
@@ -878,11 +313,11 @@
         </dia:attribute>
         <dia:attribute name="valign">
           <dia:enum val="3"/>
         </dia:attribute>
       </dia:object>
-      <dia:object type="Standard - Text" version="1" id="O23">
+      <dia:object type="Standard - Text" version="1" id="O8">
         <dia:attribute name="obj_pos">
           <dia:point val="35.1865,13.0375"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
           <dia:rectangle val="35.1865,12.4425;40.209,13.1875"/>
@@ -912,16 +347,16 @@
         <dia:attribute name="valign">
           <dia:enum val="3"/>
         </dia:attribute>
       </dia:object>
       <dia:group>
-        <dia:object type="Cisco - Switch Processor" version="1" id="O24">
+        <dia:object type="Cisco - Switch Processor" version="1" id="O9">
           <dia:attribute name="obj_pos">
             <dia:point val="29.8853,5.3088"/>
           </dia:attribute>
           <dia:attribute name="obj_bb">
-            <dia:rectangle val="29.8814,5.30707;32.8488,7.03375"/>
+            <dia:rectangle val="29.8815,5.30707;32.8488,7.03375"/>
           </dia:attribute>
           <dia:attribute name="meta">
             <dia:composite type="dict"/>
           </dia:attribute>
           <dia:attribute name="elem_corner">
@@ -957,11 +392,11 @@
           </dia:attribute>
           <dia:attribute name="subscale">
             <dia:real val="1"/>
           </dia:attribute>
         </dia:object>
-        <dia:object type="Cisco - BBFW" version="1" id="O25">
+        <dia:object type="Cisco - BBFW" version="1" id="O10">
           <dia:attribute name="obj_pos">
             <dia:point val="32.9796,5.3803"/>
           </dia:attribute>
           <dia:attribute name="obj_bb">
             <dia:rectangle val="32.9788,5.37805;34.3448,6.86455"/>
@@ -1003,11 +438,11 @@
           <dia:attribute name="subscale">
             <dia:real val="1"/>
           </dia:attribute>
         </dia:object>
       </dia:group>
-      <dia:object type="Standard - Text" version="1" id="O26">
+      <dia:object type="Standard - Text" version="1" id="O11">
         <dia:attribute name="obj_pos">
           <dia:point val="35.1865,6.4521"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
           <dia:rectangle val="35.1865,5.8571;44.839,6.6021"/>
@@ -1037,7 +472,575 @@
         <dia:attribute name="valign">
           <dia:enum val="3"/>
         </dia:attribute>
       </dia:object>
     </dia:group>
+    <dia:group>
+      <dia:object type="Cisco - Branch office" version="1" id="O12">
+        <dia:attribute name="obj_pos">
+          <dia:point val="12.5769,2"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="12.5751,1.99925;16.3386,6.89736"/>
+        </dia:attribute>
+        <dia:attribute name="meta">
+          <dia:composite type="dict"/>
+        </dia:attribute>
+        <dia:attribute name="elem_corner">
+          <dia:point val="12.5769,2"/>
+        </dia:attribute>
+        <dia:attribute name="elem_width">
+          <dia:real val="3.7598838050470751"/>
+        </dia:attribute>
+        <dia:attribute name="elem_height">
+          <dia:real val="4.8955020258754756"/>
+        </dia:attribute>
+        <dia:attribute name="line_width">
+          <dia:real val="0.15000000000000002"/>
+        </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="flip_horizontal">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="flip_vertical">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="subscale">
+          <dia:real val="1"/>
+        </dia:attribute>
+      </dia:object>
+      <dia:object type="Cisco - Generic Building" version="1" id="O13">
+        <dia:attribute name="obj_pos">
+          <dia:point val="4.04402,3.9"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="4.04221,3.89925;9.60854,12.4488"/>
+        </dia:attribute>
+        <dia:attribute name="meta">
+          <dia:composite type="dict"/>
+        </dia:attribute>
+        <dia:attribute name="elem_corner">
+          <dia:point val="4.04402,3.9"/>
+        </dia:attribute>
+        <dia:attribute name="elem_width">
+          <dia:real val="5.5637747385789851"/>
+        </dia:attribute>
+        <dia:attribute name="elem_height">
+          <dia:real val="8.5469256114553342"/>
+        </dia:attribute>
+        <dia:attribute name="line_width">
+          <dia:real val="0.15000000000000002"/>
+        </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="flip_horizontal">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="flip_vertical">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="subscale">
+          <dia:real val="1"/>
+        </dia:attribute>
+      </dia:object>
+      <dia:object type="Cisco - Branch office subdued" version="1" id="O14">
+        <dia:attribute name="obj_pos">
+          <dia:point val="10.1418,9.23071"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="10.14,9.22996;14.1729,14.4777"/>
+        </dia:attribute>
+        <dia:attribute name="meta">
+          <dia:composite type="dict"/>
+        </dia:attribute>
+        <dia:attribute name="elem_corner">
+          <dia:point val="10.1418,9.23071"/>
+        </dia:attribute>
+        <dia:attribute name="elem_width">
+          <dia:real val="4.0292525920005025"/>
+        </dia:attribute>
+        <dia:attribute name="elem_height">
+          <dia:real val="5.2450817658229738"/>
+        </dia:attribute>
+        <dia:attribute name="line_width">
+          <dia:real val="0.15000000000000002"/>
+        </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="flip_horizontal">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="flip_vertical">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="subscale">
+          <dia:real val="1"/>
+        </dia:attribute>
+      </dia:object>
+      <dia:object type="Cisco - Branch office subdued" version="1" id="O15">
+        <dia:attribute name="obj_pos">
+          <dia:point val="-0.0731838,9.25001"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="-0.075,9.24926;3.95789,14.497"/>
+        </dia:attribute>
+        <dia:attribute name="meta">
+          <dia:composite type="dict"/>
+        </dia:attribute>
+        <dia:attribute name="elem_corner">
+          <dia:point val="-0.0731838,9.25001"/>
+        </dia:attribute>
+        <dia:attribute name="elem_width">
+          <dia:real val="4.0292525920005025"/>
+        </dia:attribute>
+        <dia:attribute name="elem_height">
+          <dia:real val="5.2450817658229738"/>
+        </dia:attribute>
+        <dia:attribute name="line_width">
+          <dia:real val="0.15000000000000002"/>
+        </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="flip_horizontal">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="flip_vertical">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="subscale">
+          <dia:real val="1"/>
+        </dia:attribute>
+      </dia:object>
+      <dia:object type="Cisco - Wireless router" version="1" id="O16">
+        <dia:attribute name="obj_pos">
+          <dia:point val="5.91902,2.6286"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="4.91902,2.5286;8.83998,4.58442"/>
+        </dia:attribute>
+        <dia:attribute name="meta">
+          <dia:composite type="dict"/>
+        </dia:attribute>
+        <dia:attribute name="elem_corner">
+          <dia:point val="5.91902,2.6286"/>
+        </dia:attribute>
+        <dia:attribute name="elem_width">
+          <dia:real val="1.9209630350194509"/>
+        </dia:attribute>
+        <dia:attribute name="elem_height">
+          <dia:real val="1.9058184264897757"/>
+        </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="flip_horizontal">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="flip_vertical">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="subscale">
+          <dia:real val="1"/>
+        </dia:attribute>
+      </dia:object>
+      <dia:object type="Cisco - Wireless router" version="1" id="O17">
+        <dia:attribute name="obj_pos">
+          <dia:point val="1.17342,7.95001"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="0.17342,7.85001;4.09438,9.90583"/>
+        </dia:attribute>
+        <dia:attribute name="meta">
+          <dia:composite type="dict"/>
+        </dia:attribute>
+        <dia:attribute name="elem_corner">
+          <dia:point val="1.17342,7.95001"/>
+        </dia:attribute>
+        <dia:attribute name="elem_width">
+          <dia:real val="1.9209630350194509"/>
+        </dia:attribute>
+        <dia:attribute name="elem_height">
+          <dia:real val="1.9058184264897757"/>
+        </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="flip_horizontal">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="flip_vertical">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="subscale">
+          <dia:real val="1"/>
+        </dia:attribute>
+      </dia:object>
+      <dia:object type="Cisco - Wireless router" version="1" id="O18">
+        <dia:attribute name="obj_pos">
+          <dia:point val="13.5734,0.75"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="12.5734,0.65;16.4944,2.70582"/>
+        </dia:attribute>
+        <dia:attribute name="meta">
+          <dia:composite type="dict"/>
+        </dia:attribute>
+        <dia:attribute name="elem_corner">
+          <dia:point val="13.5734,0.75"/>
+        </dia:attribute>
+        <dia:attribute name="elem_width">
+          <dia:real val="1.920963035019452"/>
+        </dia:attribute>
+        <dia:attribute name="elem_height">
+          <dia:real val="1.9058184264897768"/>
+        </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="flip_horizontal">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="flip_vertical">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="subscale">
+          <dia:real val="1"/>
+        </dia:attribute>
+      </dia:object>
+      <dia:object type="Standard - Line" version="0" id="O19">
+        <dia:attribute name="obj_pos">
+          <dia:point val="7.83998,3.88733"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="7.74605,2.02037;13.617,3.98126"/>
+        </dia:attribute>
+        <dia:attribute name="conn_endpoints">
+          <dia:point val="7.83998,3.88733"/>
+          <dia:point val="13.5231,2.1143"/>
+        </dia:attribute>
+        <dia:attribute name="numcp">
+          <dia:int val="1"/>
+        </dia:attribute>
+        <dia:attribute name="line_color">
+          <dia:color val="#00ff00"/>
+        </dia:attribute>
+        <dia:attribute name="line_width">
+          <dia:real val="0.15000000000000002"/>
+        </dia:attribute>
+        <dia:connections>
+          <dia:connection handle="0" to="O16" connection="8"/>
+          <dia:connection handle="1" to="O18" connection="9"/>
+        </dia:connections>
+      </dia:object>
+      <dia:object type="Standard - Line" version="0" id="O20">
+        <dia:attribute name="obj_pos">
+          <dia:point val="7.83998,4.16087"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="7.73408,4.05496;11.9017,8.68084"/>
+        </dia:attribute>
+        <dia:attribute name="conn_endpoints">
+          <dia:point val="7.83998,4.16087"/>
+          <dia:point val="11.7958,8.57493"/>
+        </dia:attribute>
+        <dia:attribute name="numcp">
+          <dia:int val="1"/>
+        </dia:attribute>
+        <dia:attribute name="line_color">
+          <dia:color val="#00ff00"/>
+        </dia:attribute>
+        <dia:attribute name="line_width">
+          <dia:real val="0.15000000000000002"/>
+        </dia:attribute>
+        <dia:connections>
+          <dia:connection handle="0" to="O16" connection="7"/>
+          <dia:connection handle="1" to="O26" connection="9"/>
+        </dia:connections>
+      </dia:object>
+      <dia:object type="Standard - Line" version="0" id="O21">
+        <dia:attribute name="obj_pos">
+          <dia:point val="3.14403,9.00092"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="3.06903,8.92592;11.2485,9.07592"/>
+        </dia:attribute>
+        <dia:attribute name="conn_endpoints">
+          <dia:point val="3.14403,9.00092"/>
+          <dia:point val="11.1735,9.00092"/>
+        </dia:attribute>
+        <dia:attribute name="numcp">
+          <dia:int val="1"/>
+        </dia:attribute>
+        <dia:attribute name="line_color">
+          <dia:color val="#00ff00"/>
+        </dia:attribute>
+        <dia:attribute name="line_width">
+          <dia:real val="0.15000000000000002"/>
+        </dia:attribute>
+        <dia:connections>
+          <dia:connection handle="0" to="O17" connection="9"/>
+          <dia:connection handle="1" to="O26" connection="9"/>
+        </dia:connections>
+      </dia:object>
+      <dia:object type="Standard - Line" version="0" id="O22">
+        <dia:attribute name="obj_pos">
+          <dia:point val="2.81789,8.2269"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="2.712,4.35961;6.27817,8.33279"/>
+        </dia:attribute>
+        <dia:attribute name="conn_endpoints">
+          <dia:point val="2.81789,8.2269"/>
+          <dia:point val="6.17227,4.46551"/>
+        </dia:attribute>
+        <dia:attribute name="numcp">
+          <dia:int val="1"/>
+        </dia:attribute>
+        <dia:attribute name="line_color">
+          <dia:color val="#00ff00"/>
+        </dia:attribute>
+        <dia:attribute name="line_width">
+          <dia:real val="0.15000000000000002"/>
+        </dia:attribute>
+        <dia:connections>
+          <dia:connection handle="0" to="O17" connection="9"/>
+          <dia:connection handle="1" to="O16" connection="9"/>
+        </dia:connections>
+      </dia:object>
+      <dia:object type="Cisco - Cloud Gold" version="1" id="O23">
+        <dia:attribute name="obj_pos">
+          <dia:point val="16.6285,2.52"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="16.6278,2.51925;25.7293,10.5708"/>
+        </dia:attribute>
+        <dia:attribute name="meta">
+          <dia:composite type="dict"/>
+        </dia:attribute>
+        <dia:attribute name="elem_corner">
+          <dia:point val="16.6285,2.52"/>
+        </dia:attribute>
+        <dia:attribute name="elem_width">
+          <dia:real val="9.1000000000000014"/>
+        </dia:attribute>
+        <dia:attribute name="elem_height">
+          <dia:real val="8.0500000000000007"/>
+        </dia:attribute>
+        <dia:attribute name="line_width">
+          <dia:real val="0.15000000000000002"/>
+        </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="flip_horizontal">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="flip_vertical">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="subscale">
+          <dia:real val="1"/>
+        </dia:attribute>
+      </dia:object>
+      <dia:object type="Standard - Text" version="1" id="O24">
+        <dia:attribute name="obj_pos">
+          <dia:point val="21.5117,6.59694"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="18.2605,6.00194;24.763,6.74694"/>
+        </dia:attribute>
+        <dia:attribute name="text">
+          <dia:composite type="text">
+            <dia:attribute name="string">
+              <dia:string>#Community network#</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="21.5117,6.59694"/>
+            </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="valign">
+          <dia:enum val="3"/>
+        </dia:attribute>
+        <dia:connections>
+          <dia:connection handle="0" to="O23" connection="14"/>
+        </dia:connections>
+      </dia:object>
+      <dia:object type="Standard - Line" version="0" id="O25">
+        <dia:attribute name="obj_pos">
+          <dia:point val="15.462,2.44256"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="15.3577,2.33828;17.9449,4.18026"/>
+        </dia:attribute>
+        <dia:attribute name="conn_endpoints">
+          <dia:point val="15.462,2.44256"/>
+          <dia:point val="17.8406,4.07598"/>
+        </dia:attribute>
+        <dia:attribute name="numcp">
+          <dia:int val="1"/>
+        </dia:attribute>
+        <dia:attribute name="line_color">
+          <dia:color val="#00ff00"/>
+        </dia:attribute>
+        <dia:attribute name="line_width">
+          <dia:real val="0.15000000000000002"/>
+        </dia:attribute>
+        <dia:connections>
+          <dia:connection handle="0" to="O18" connection="9"/>
+          <dia:connection handle="1" to="O23" connection="14"/>
+        </dia:connections>
+      </dia:object>
+      <dia:object type="Cisco - Wireless router" version="1" id="O26">
+        <dia:attribute name="obj_pos">
+          <dia:point val="11.2234,7.95001"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="10.2234,7.85001;14.1444,9.90583"/>
+        </dia:attribute>
+        <dia:attribute name="meta">
+          <dia:composite type="dict"/>
+        </dia:attribute>
+        <dia:attribute name="elem_corner">
+          <dia:point val="11.2234,7.95001"/>
+        </dia:attribute>
+        <dia:attribute name="elem_width">
+          <dia:real val="1.9209630350194509"/>
+        </dia:attribute>
+        <dia:attribute name="elem_height">
+          <dia:real val="1.9058184264897757"/>
+        </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="flip_horizontal">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="flip_vertical">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="subscale">
+          <dia:real val="1"/>
+        </dia:attribute>
+      </dia:object>
+    </dia:group>
   </dia:layer>
 </dia:diagram>

Index: diagrams/community-network-integration,2.dia
==================================================================
--- diagrams/community-network-integration,2.dia
+++ diagrams/community-network-integration,2.dia
@@ -112,11 +112,11 @@
       <dia:object type="Cisco - Generic Building" version="1" id="O1">
         <dia:attribute name="obj_pos">
           <dia:point val="-10.5329,-9.1"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="-10.5347,-9.10075;-4.96836,-0.551195"/>
+          <dia:rectangle val="-10.5347,-9.10075;-4.96838,-0.551195"/>
         </dia:attribute>
         <dia:attribute name="meta">
           <dia:composite type="dict"/>
         </dia:attribute>
         <dia:attribute name="elem_corner">
@@ -382,11 +382,11 @@
       <dia:object type="Standard - Line" version="0" id="O7">
         <dia:attribute name="obj_pos">
           <dia:point val="-6.73692,-9.11267"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="-6.83085,-10.9796;-0.959894,-9.01874"/>
+          <dia:rectangle val="-6.83085,-10.9796;-0.959895,-9.01874"/>
         </dia:attribute>
         <dia:attribute name="conn_endpoints">
           <dia:point val="-6.73692,-9.11267"/>
           <dia:point val="-1.05383,-10.8857"/>
         </dia:attribute>
@@ -407,11 +407,11 @@
       <dia:object type="Standard - Line" version="0" id="O8">
         <dia:attribute name="obj_pos">
           <dia:point val="-6.73692,-8.83913"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="-6.84282,-8.94504;-2.67516,-4.31916"/>
+          <dia:rectangle val="-6.84283,-8.94504;-2.67516,-4.31916"/>
         </dia:attribute>
         <dia:attribute name="conn_endpoints">
           <dia:point val="-6.73692,-8.83913"/>
           <dia:point val="-2.78106,-4.42507"/>
         </dia:attribute>
@@ -457,11 +457,11 @@
       <dia:object type="Standard - Line" version="0" id="O10">
         <dia:attribute name="obj_pos">
           <dia:point val="-11.759,-4.7731"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="-11.8649,-8.64039;-8.29873,-4.66721"/>
+          <dia:rectangle val="-11.8649,-8.64039;-8.29874,-4.66721"/>
         </dia:attribute>
         <dia:attribute name="conn_endpoints">
           <dia:point val="-11.759,-4.7731"/>
           <dia:point val="-8.40463,-8.53449"/>
         </dia:attribute>
@@ -544,12 +544,12 @@
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.15000000000000002"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O33" connection="9"/>
-        <dia:connection handle="1" to="O34" connection="9"/>
+        <dia:connection handle="0" to="O32" connection="9"/>
+        <dia:connection handle="1" to="O33" connection="9"/>
       </dia:connections>
     </dia:object>
     <dia:object type="Cisco - Cloud Gold" version="1" id="O13">
       <dia:attribute name="obj_pos">
         <dia:point val="6.14082,-11.4852"/>
@@ -593,44 +593,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O14">
-      <dia:attribute name="obj_pos">
-        <dia:point val="7.02262,-7.15828"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.02262,-7.84078;14.5726,-6.98578"/>
-      </dia:attribute>
-      <dia:attribute name="text">
-        <dia:composite type="text">
-          <dia:attribute name="string">
-            <dia:string>#Community Network#</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.91722218692302704"/>
-          </dia:attribute>
-          <dia:attribute name="pos">
-            <dia:point val="7.02262,-7.15828"/>
-          </dia:attribute>
-          <dia:attribute name="color">
-            <dia:color val="#000000"/>
-          </dia:attribute>
-          <dia:attribute name="alignment">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="valign">
-        <dia:enum val="3"/>
-      </dia:attribute>
-    </dia:object>
-    <dia:object type="Cisco - Cloud Gold" version="1" id="O15">
+    <dia:object type="Cisco - Cloud Gold" version="1" id="O14">
       <dia:attribute name="obj_pos">
         <dia:point val="19.8237,-15.4242"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="19.8229,-15.425;40.0547,0.504681"/>
@@ -671,19 +638,19 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O16">
+    <dia:object type="Standard - Line" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="15.1517,-7.21223"/>
+        <dia:point val="15.2263,-7.70271"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.0674,-8.31075;22.7847,-7.12791"/>
+        <dia:rectangle val="15.1462,-8.30649;22.7805,-7.62265"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="15.1517,-7.21223"/>
+        <dia:point val="15.2263,-7.70271"/>
         <dia:point val="22.7004,-8.22643"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
@@ -691,12 +658,15 @@
         <dia:color val="#00ff00"/>
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.15000000000000002"/>
       </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O13" connection="14"/>
+      </dia:connections>
     </dia:object>
-    <dia:object type="Cisco - Wireless router" version="1" id="O17">
+    <dia:object type="Cisco - Wireless router" version="1" id="O16">
       <dia:attribute name="obj_pos">
         <dia:point val="32.0001,-13.9622"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="31.0001,-14.0622;34.9211,-12.0064"/>
@@ -737,11 +707,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - Wireless router" version="1" id="O18">
+    <dia:object type="Cisco - Wireless router" version="1" id="O17">
       <dia:attribute name="obj_pos">
         <dia:point val="22.7501,-9.41222"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="21.7501,-9.51222;25.6711,-7.4564"/>
@@ -782,11 +752,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - Switch Processor" version="1" id="O19">
+    <dia:object type="Cisco - Switch Processor" version="1" id="O18">
       <dia:attribute name="obj_pos">
         <dia:point val="26.3539,-9.26052"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="26.3501,-9.26225;29.3174,-7.53557"/>
@@ -827,11 +797,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - BBFW" version="1" id="O20">
+    <dia:object type="Cisco - BBFW" version="1" id="O19">
       <dia:attribute name="obj_pos">
         <dia:point val="29.4482,-9.18902"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="29.4474,-9.19127;30.8134,-7.70477"/>
@@ -872,11 +842,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - Switch Processor" version="1" id="O21">
+    <dia:object type="Cisco - Switch Processor" version="1" id="O20">
       <dia:attribute name="obj_pos">
         <dia:point val="25.9039,-6.41052"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="25.9001,-6.41225;28.8674,-4.68557"/>
@@ -917,11 +887,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - BBFW" version="1" id="O22">
+    <dia:object type="Cisco - BBFW" version="1" id="O21">
       <dia:attribute name="obj_pos">
         <dia:point val="28.9982,-6.33902"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="28.9974,-6.34127;30.3634,-4.85477"/>
@@ -962,11 +932,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - Switch Processor" version="1" id="O23">
+    <dia:object type="Cisco - Switch Processor" version="1" id="O22">
       <dia:attribute name="obj_pos">
         <dia:point val="33.004,-11.4105"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="33.0002,-11.4122;35.9675,-9.68555"/>
@@ -1007,11 +977,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - BBFW" version="1" id="O24">
+    <dia:object type="Cisco - BBFW" version="1" id="O23">
       <dia:attribute name="obj_pos">
         <dia:point val="31.3982,-11.139"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="31.3959,-11.1413;32.7619,-9.65475"/>
@@ -1052,11 +1022,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - Switch Processor" version="1" id="O25">
+    <dia:object type="Cisco - Switch Processor" version="1" id="O24">
       <dia:attribute name="obj_pos">
         <dia:point val="34.0081,-8.46052"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="34.0043,-8.46225;36.9716,-6.73557"/>
@@ -1097,11 +1067,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - BBFW" version="1" id="O26">
+    <dia:object type="Cisco - BBFW" version="1" id="O25">
       <dia:attribute name="obj_pos">
         <dia:point val="32.4024,-8.18902"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="32.4001,-8.19127;33.7661,-6.70477"/>
@@ -1142,11 +1112,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O27">
+    <dia:object type="Standard - Line" version="0" id="O26">
       <dia:attribute name="obj_pos">
         <dia:point val="31.9757,-12.4299"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="24.3167,-12.5303;32.0761,-8.61152"/>
@@ -1163,15 +1133,15 @@
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.15000000000000002"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O17" connection="9"/>
-        <dia:connection handle="1" to="O18" connection="9"/>
+        <dia:connection handle="0" to="O16" connection="9"/>
+        <dia:connection handle="1" to="O17" connection="9"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O28">
+    <dia:object type="Standard - Line" version="0" id="O27">
       <dia:attribute name="obj_pos">
         <dia:point val="23.9123,-7.46582"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="23.8223,-7.55584;24.8384,-3.77719"/>
@@ -1188,15 +1158,15 @@
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.15000000000000002"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O18" connection="9"/>
-        <dia:connection handle="1" to="O34" connection="9"/>
+        <dia:connection handle="0" to="O17" connection="9"/>
+        <dia:connection handle="1" to="O33" connection="9"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O29">
+    <dia:object type="Standard - Line" version="0" id="O28">
       <dia:attribute name="obj_pos">
         <dia:point val="24.7199,-8.31592"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="24.6416,-8.39419;26.4322,-8.16461"/>
@@ -1210,14 +1180,14 @@
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.15000000000000002"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O18" connection="9"/>
+        <dia:connection handle="0" to="O17" connection="9"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O30">
+    <dia:object type="Standard - Line" version="0" id="O29">
       <dia:attribute name="obj_pos">
         <dia:point val="25.5645,-4.01137"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="25.4588,-4.79181;26.4688,-3.90567"/>
@@ -1231,14 +1201,14 @@
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.15000000000000002"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O34" connection="9"/>
+        <dia:connection handle="0" to="O33" connection="9"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O31">
+    <dia:object type="Standard - Line" version="0" id="O30">
       <dia:attribute name="obj_pos">
         <dia:point val="33.4985,-12.0708"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="33.3948,-12.1745;34.0305,-11.3056"/>
@@ -1252,14 +1222,14 @@
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.15000000000000002"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O17" connection="9"/>
+        <dia:connection handle="0" to="O16" connection="9"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O32">
+    <dia:object type="Standard - Line" version="0" id="O31">
       <dia:attribute name="obj_pos">
         <dia:point val="35.9509,-5.35711"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="35.2219,-6.83666;36.0503,-5.25775"/>
@@ -1273,14 +1243,14 @@
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.15000000000000002"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O33" connection="9"/>
+        <dia:connection handle="0" to="O32" connection="9"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Cisco - Wireless router" version="1" id="O33">
+    <dia:object type="Cisco - Wireless router" version="1" id="O32">
       <dia:attribute name="obj_pos">
         <dia:point val="35.2001,-5.96222"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="34.2001,-6.06222;38.1211,-4.0064"/>
@@ -1321,11 +1291,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - Wireless router" version="1" id="O34">
+    <dia:object type="Cisco - Wireless router" version="1" id="O33">
       <dia:attribute name="obj_pos">
         <dia:point val="23.9001,-4.46222"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="22.9001,-4.56222;26.8211,-2.5064"/>
@@ -1366,11 +1336,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - Switch Processor" version="1" id="O35">
+    <dia:object type="Cisco - Switch Processor" version="1" id="O34">
       <dia:attribute name="obj_pos">
         <dia:point val="-18.7411,-3.85019"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="-18.7449,-3.85192;-15.7776,-2.12524"/>
@@ -1411,11 +1381,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - Switch Processor" version="1" id="O36">
+    <dia:object type="Cisco - Switch Processor" version="1" id="O35">
       <dia:attribute name="obj_pos">
         <dia:point val="-5.37468,-14.9468"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="-5.3785,-14.9485;-2.41114,-13.2219"/>
@@ -1456,11 +1426,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O37">
+    <dia:object type="Standard - Line" version="0" id="O36">
       <dia:attribute name="obj_pos">
         <dia:point val="-15.7803,-3.29943"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="-15.8691,-3.87705;-13.3643,-3.21061"/>
@@ -1474,15 +1444,15 @@
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.15000000000000002"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O35" connection="10"/>
+        <dia:connection handle="0" to="O34" connection="10"/>
         <dia:connection handle="1" to="O5" connection="9"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O38">
+    <dia:object type="Standard - Line" version="0" id="O37">
       <dia:attribute name="obj_pos">
         <dia:point val="-2.74622,-13.2231"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="-2.85122,-13.3282;-0.697205,-11.6592"/>
@@ -1496,15 +1466,15 @@
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.15000000000000002"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O36" connection="10"/>
+        <dia:connection handle="0" to="O35" connection="10"/>
         <dia:connection handle="1" to="O6" connection="9"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O39">
+    <dia:object type="Standard - Text" version="1" id="O38">
       <dia:attribute name="obj_pos">
         <dia:point val="2,-6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="2,-6.595;5.6075,-4.25"/>
@@ -1535,11 +1505,11 @@
       </dia:attribute>
       <dia:attribute name="valign">
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O40">
+    <dia:object type="Standard - Text" version="1" id="O39">
       <dia:attribute name="obj_pos">
         <dia:point val="-15,-12"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="-17.6288,-12.595;-12.3712,-10.25"/>
@@ -1570,16 +1540,16 @@
       </dia:attribute>
       <dia:attribute name="valign">
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O41">
+    <dia:object type="Standard - Text" version="1" id="O40">
       <dia:attribute name="obj_pos">
-        <dia:point val="30,-3"/>
+        <dia:point val="31,-3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30,-3.595;32.9375,-2.05"/>
+        <dia:rectangle val="29.5312,-3.595;32.4688,-2.05"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
             <dia:string>#Research
@@ -1590,25 +1560,25 @@
           </dia:attribute>
           <dia:attribute name="height">
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="30,-3"/>
+            <dia:point val="31,-3"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
       <dia:attribute name="valign">
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O42">
+    <dia:object type="Standard - Line" version="0" id="O41">
       <dia:attribute name="obj_pos">
         <dia:point val="-15,-10"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="-15.5918,-10.0537;-14.9319,-5.93592"/>
@@ -1631,22 +1601,22 @@
       </dia:attribute>
       <dia:attribute name="end_arrow_width">
         <dia:real val="0.5"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="1" to="O44" connection="8"/>
+        <dia:connection handle="1" to="O43" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O43">
+    <dia:object type="Standard - Line" version="0" id="O42">
       <dia:attribute name="obj_pos">
-        <dia:point val="0.966664,-10.8513"/>
+        <dia:point val="0.96754,-10.851"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.871415,-10.9465;7.1655,-8.66655"/>
+        <dia:rectangle val="0.872292,-10.9462;7.1655,-8.66655"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="0.966664,-10.8513"/>
+        <dia:point val="0.96754,-10.851"/>
         <dia:point val="7.07025,-8.7618"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
@@ -1656,13 +1626,14 @@
       <dia:attribute name="line_width">
         <dia:real val="0.15000000000000002"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O6" connection="9"/>
+        <dia:connection handle="1" to="O13" connection="14"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Ellipse" version="0" id="O44">
+    <dia:object type="Standard - Ellipse" version="0" id="O43">
       <dia:attribute name="obj_pos">
         <dia:point val="-20,-6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="-20.05,-6.05;-10.95,-0.95"/>
@@ -1684,11 +1655,11 @@
       </dia:attribute>
       <dia:attribute name="line_style">
         <dia:enum val="4"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O45">
+    <dia:object type="Standard - Line" version="0" id="O44">
       <dia:attribute name="obj_pos">
         <dia:point val="2,-5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="0.100543,-10.4176;2.06317,-4.93683"/>
@@ -1714,11 +1685,11 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="1" to="O6" connection="9"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O46">
+    <dia:object type="Standard - Line" version="0" id="O45">
       <dia:attribute name="obj_pos">
         <dia:point val="2,-5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="-6.78889,-8.95874;2.06601,-4.93399"/>
@@ -1744,11 +1715,11 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="1" to="O4" connection="9"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O47">
+    <dia:object type="Standard - Line" version="0" id="O46">
       <dia:attribute name="obj_pos">
         <dia:point val="2,-5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="-1.58839,-5.05985;2.05985,-4.00774"/>
@@ -1774,11 +1745,11 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="1" to="O11" connection="9"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O48">
+    <dia:object type="Standard - Line" version="0" id="O47">
       <dia:attribute name="obj_pos">
         <dia:point val="-1.51717,-3.30109"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="-1.62253,-3.40644;1.49663,-0.894393"/>
@@ -1793,14 +1764,14 @@
       <dia:attribute name="line_width">
         <dia:real val="0.15000000000000002"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O11" connection="9"/>
-        <dia:connection handle="1" to="O49" connection="10"/>
+        <dia:connection handle="1" to="O48" connection="10"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Cisco - Switch Processor" version="1" id="O49">
+    <dia:object type="Cisco - Switch Processor" version="1" id="O48">
       <dia:attribute name="obj_pos">
         <dia:point val="1,-1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="0.996177,-1.00173;3.96354,0.724946"/>
@@ -1841,11 +1812,11 @@
       </dia:attribute>
       <dia:attribute name="subscale">
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O50">
+    <dia:object type="Standard - Text" version="1" id="O49">
       <dia:attribute name="obj_pos">
         <dia:point val="-6,-14"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="-8.7675,-15.1725;-6,-12.8275"/>
@@ -1876,11 +1847,11 @@
       </dia:attribute>
       <dia:attribute name="valign">
         <dia:enum val="2"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O51">
+    <dia:object type="Standard - Text" version="1" id="O50">
       <dia:attribute name="obj_pos">
         <dia:point val="5,0"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:rectangle val="5,-1.1725;7.7675,1.1725"/>
@@ -1910,8 +1881,44 @@
         </dia:composite>
       </dia:attribute>
       <dia:attribute name="valign">
         <dia:enum val="2"/>
       </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O51">
+      <dia:attribute name="obj_pos">
+        <dia:point val="11.0241,-7.40826"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="7.7728,-8.00326;14.2753,-7.25826"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#Community network#</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="11.0241,-7.40826"/>
+          </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="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O13" connection="14"/>
+      </dia:connections>
     </dia:object>
   </dia:layer>
 </dia:diagram>

Index: diagrams/interactions.dia
==================================================================
--- diagrams/interactions.dia
+++ diagrams/interactions.dia
@@ -60,11 +60,11 @@
         <dia:attribute name="hguides"/>
         <dia:attribute name="vguides"/>
       </dia:composite>
     </dia:attribute>
   </dia:diagramdata>
-  <dia:layer name="Fons" visible="true" active="true">
+  <dia:layer name="Fons" visible="true">
     <dia:object type="Flowchart - Ellipse" version="0" id="O0">
       <dia:attribute name="obj_pos">
         <dia:point val="20,14"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
@@ -772,11 +772,11 @@
     <dia:object type="Standard - Arc" version="0" id="O16">
       <dia:attribute name="obj_pos">
         <dia:point val="19.3019,6.06378"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.2365,5.88312;36.0585,13.0619"/>
+        <dia:rectangle val="19.2365,5.88312;36.0585,13.062"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="19.3019,6.06378"/>
         <dia:point val="35.9931,12.9966"/>
       </dia:attribute>
@@ -828,11 +828,11 @@
     <dia:object type="Standard - Arc" version="0" id="O18">
       <dia:attribute name="obj_pos">
         <dia:point val="35.9931,12.9966"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.3851,12.9317;36.1591,22.0149"/>
+        <dia:rectangle val="32.3851,12.9317;36.159,22.0149"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="35.9931,12.9966"/>
         <dia:point val="32.45,21.95"/>
       </dia:attribute>
@@ -936,11 +936,11 @@
         <dia:connection handle="0" to="O6" connection="16"/>
         <dia:connection handle="1" to="O5" connection="16"/>
       </dia:connections>
     </dia:object>
   </dia:layer>
-  <dia:layer name="Step labels" visible="true">
+  <dia:layer name="Step labels" visible="true" active="true">
     <dia:object type="Standard - Text" version="1" id="O22">
       <dia:attribute name="obj_pos">
         <dia:point val="0,13"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
@@ -976,17 +976,17 @@
     <dia:object type="Standard - Text" version="1" id="O23">
       <dia:attribute name="obj_pos">
         <dia:point val="7,12"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7,11.405;11.55,12.95"/>
+        <dia:rectangle val="7,11.3864;11.5686,12.9872"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
             <dia:string>#(2) Instantiate
-slivers#</dia:string>
+slice#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
           </dia:attribute>
           <dia:attribute name="height">
@@ -1007,28 +1007,28 @@
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
     <dia:object type="Standard - Text" version="1" id="O24">
       <dia:attribute name="obj_pos">
-        <dia:point val="12,3"/>
+        <dia:point val="11,3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="12,2.405;17.87,3.15"/>
+        <dia:rectangle val="11,2.405;17.48,3.15"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#(1,2,3,5,6) Update#</dia:string>
+            <dia:string>#(1,2,3,5,6,7) Update#</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,3"/>
+            <dia:point val="11,3"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
@@ -1082,11 +1082,11 @@
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
             <dia:string>#(3) Activate
-slivers#</dia:string>
+slice#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
           </dia:attribute>
           <dia:attribute name="height">
@@ -1209,16 +1209,16 @@
     <dia:object type="Standard - Text" version="1" id="O30">
       <dia:attribute name="obj_pos">
         <dia:point val="31,18"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31,17.405;33.5675,18.15"/>
+        <dia:rectangle val="31,17.3864;33.5861,18.1873"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#(4) Stop#</dia:string>
+            <dia:string>#(5) Stop#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
           </dia:attribute>
           <dia:attribute name="height">
@@ -1239,29 +1239,29 @@
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
     <dia:object type="Standard - Text" version="1" id="O31">
       <dia:attribute name="obj_pos">
-        <dia:point val="15,24"/>
+        <dia:point val="14,24"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15,23.405;18.3025,24.95"/>
+        <dia:rectangle val="14,23.405;19.1425,24.95"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#(4) Collect
-results#</dia:string>
+            <dia:string>#(4) Interact
+&amp; collect results#</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="15,24"/>
+            <dia:point val="14,24"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
@@ -1276,17 +1276,17 @@
     <dia:object type="Standard - Text" version="1" id="O32">
       <dia:attribute name="obj_pos">
         <dia:point val="9,9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9,8.405;14.425,9.95"/>
+        <dia:rectangle val="9,8.38637;13.6061,9.98725"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#(5) Deinstantiate
-slivers#</dia:string>
+            <dia:string>#(5) Deactivate
+slice#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
           </dia:attribute>
           <dia:attribute name="height">
@@ -1307,28 +1307,28 @@
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
     <dia:object type="Standard - Text" version="1" id="O33">
       <dia:attribute name="obj_pos">
-        <dia:point val="32,8"/>
+        <dia:point val="33,9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32,7.405;37.425,8.15"/>
+        <dia:rectangle val="33,8.38637;38.4436,9.18725"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#(5) Deinstantiate#</dia:string>
+            <dia:string>#(6) Deinstantiate#</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="32,8"/>
+            <dia:point val="33,9"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
@@ -1343,16 +1343,16 @@
     <dia:object type="Standard - Text" version="1" id="O34">
       <dia:attribute name="obj_pos">
         <dia:point val="30,19"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30,18.405;33.7125,19.15"/>
+        <dia:rectangle val="30,18.3864;33.7311,19.1873"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#(5) Remove#</dia:string>
+            <dia:string>#(6) Remove#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
           </dia:attribute>
           <dia:attribute name="height">
@@ -1406,29 +1406,96 @@
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
     <dia:object type="Standard - Text" version="1" id="O36">
       <dia:attribute name="obj_pos">
-        <dia:point val="6,7"/>
+        <dia:point val="13,7"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="13,6.38638;16.2336,7.98725"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#(7) Delete
+slice#</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="13,7"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O37">
+      <dia:attribute name="obj_pos">
+        <dia:point val="5,7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6,6.405;9.7125,7.95"/>
+        <dia:rectangle val="5,6.38638;10.4436,7.98725"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#(6) Remove
+            <dia:string>#(6) Deinstantiate
 slice#</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="6,7"/>
+            <dia:point val="5,7"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O38">
+      <dia:attribute name="obj_pos">
+        <dia:point val="32,8"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="32,7.38638;36.6061,8.18725"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#(5) Deactivate#</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="32,8"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">

Index: slides.svg
==================================================================
--- slides.svg
+++ slides.svg
cannot compute difference between binary files