Index: script,lightning.txt
==================================================================
--- script,lightning.txt
+++ script,lightning.txt
@@ -44,21 +44,12 @@
 - However, it supports the peculiarities of CNs: their distributed ownership,
   the fairness between their users, and their diversity but also
   their instability.
 - It's important to note that all Community-Lab's software and documentation
   is “free as in freedom” so you can use them to setup your own CONFINE
-  testbed. *##*
-
-** Community-Lab as community infrastructure
-- Besides supporting experimentation, *##* CONFINE helps physically extend CNs
-  not only with new Community-Lab nodes, but also with new links…
-- … and even services hosted in nodes like web servers, video broadcast
-  stations, etc. to be used by the community. *##*
-- In a more sophisticated approach, nodes can also be used to implement cloud
-  infrastructure provided and managed by the community for the community.
-  This is the mission of the Clommunity project.
-- Now, how does the Community-Lab testbed work? *##*
+  testbed.
+- Now let's see how Community-Lab works. *##*
 
 * Architecture and technologies
 ** Testbed architecture
 - It consists of a set of nodes (managed by CN members) that follow the
   configuration in a set of servers (managed by testbed operators).
@@ -79,10 +70,19 @@
 - The GUI and REST API in servers are implemented as Django applications.
 - The IPv6 overlay used for the management network is a tinc mesh VPN. *##*
 - Finally, we use Git, Redmine, Jenkins and our Virtual CONFINE Tesbed (VCT)
   package for development and testing. *##*
 
+* Community-Lab as community infrastructure
+- Besides supporting experimentation, *##* CONFINE helps physically extend CNs
+  not only with new Community-Lab nodes, but also with new links…
+- … and even services hosted in nodes like web servers, video broadcast
+  stations, etc. to be used by the community. *##*
+- In a more sophisticated approach, nodes can also be used to implement cloud
+  infrastructure provided and managed by the community for the community.
+  This is the mission of the Clommunity project. *##*
+
 * Collaborations
 - CONFINE actively collaborates to the development of several Free software
   projects: the OpenWrt router distro, the BMX6 and OLSR mesh routing
   protocols, the DLEP protocol for collecting link characteristics, the NodeDB
   for describing CN nodes, the lower-level Wibed testbed, and the quick mesh

Index: slides,lightning.txt
==================================================================
--- slides,lightning.txt
+++ slides,lightning.txt
@@ -95,26 +95,10 @@
     - Fair to other users  
       (no spying, no low-level, routing & above)
     - Simple, tolerant to network failures
 - Free software: build your own testbed!
 
-# Community-Lab as community infrastructure
-
-- Extend CNs **[+]**
-- Community-Lab for hosting services
-- [Clommunity](http://clommunity-project.eu/): community clouds
-
-# … Extend CNs
-
-![Extending community networks](imgs/extend-network.png)
-
-# Community-Lab as community infrastructure
-
-- Extend CNs (with Community-Lab nodes and links)
-- Community-Lab for hosting services
-- [Clommunity](http://clommunity-project.eu/): community clouds
-
 # Architecture and technologies (1/6)
 
 ![CONFINE testbed architecture](imgs/testbed.png)
 
 # Architecture and technologies (2/6)
@@ -135,10 +119,26 @@
 
 # Architecture and technologies (6/6)
 
 ![CONFINE testbed architecture](imgs/testbed-logos-devel.png)
 
+# Community-Lab as community infrastructure
+
+- Extend CNs **[+]**
+- Community-Lab for hosting services
+- [Clommunity](http://clommunity-project.eu/): community clouds
+
+# … Extend CNs
+
+![Extending community networks](imgs/extend-network.png)
+
+# Community-Lab as community infrastructure
+
+- Extend CNs (with Community-Lab nodes and links)
+- Community-Lab for hosting services
+- [Clommunity](http://clommunity-project.eu/): community clouds
+
 # Collaborations
 
 - [OpenWrt](https://openwrt.org/)
 - [BMX6](http://bmx6.net/)
 - [OLSR](http://olsr.org/)