Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -1,6 +1,6 @@
-IMGS = imgs/network-private.png imgs/network-public.png imgs/network-community.png \
+IMGS = imgs/network-public.png imgs/network-private.png imgs/network-community.png \
 	imgs/confine-partners.png imgs/extend-network.png
 IMGS_BEAMER = imgs/confine,background.pdf
 
 
 .PHONY:	clean
@@ -16,14 +16,14 @@
 
 
 imgs/confine,background.pdf:	logos/confine,logo.svg
 	inkscape -z -D -A $@ $<
 
-imgs/network-private.png:	diagrams/network-private.dia
+imgs/network-public.png:	diagrams/network-public.dia
 	dia -e $@ -s 1024x $<
 
-imgs/network-public.png:	diagrams/network-public.dia
+imgs/network-private.png:	diagrams/network-private.dia
 	dia -e $@ -s 1024x $<
 
 imgs/network-community.png:	diagrams/network-community.dia
 	dia -e $@ -s 1024x $<
 

Index: script,lightning.txt
==================================================================
--- script,lightning.txt
+++ script,lightning.txt
@@ -9,22 +9,25 @@
 - For those of you who are new to the term, CNs are infrastructure deployed by
   organized groups of people for the self-provision of broadband networking
   that works and grows according to their own interests.
 - Like some Free software projects, they are based on open participation, open
   and transparent management, and distributed ownership.  This goes way beyond
-  *##* private-owned networks and Internet access, and even *##* state-owned
-  networks with private ISPs. *##* In a community network everyone owns their
+  *##* state-owned networks with private ISPs, and even *##* private-owned
+  networks and Internet access. *##* In a community network everyone owns their
   piece of the network and are free to access other's services through it. *##*
 - The previous characteristics translate into open, free (as in freedom) and
   neutral networks, values in consonance with the Free software movement.
   Some CNs even have mutual agreement texts similar to Free software liceses.
 - Atypical as it may seem, the EU in its Digital Agenda regards CNs as
   fundamental for the universalization of broadband networking. *##*
 
 ** The CONFINE project
 - Under the umbrella of the Digital Agenda, CONFINE is a EU-financed project
-  with several partners: *##* CNs, research institutions and supporting NGOs. *##*
+  with several partners: *##* CNs (guifi.net, Athens Metropolitan Wireless
+  Network and Funkfeuer), research institutions (Universitat Politècnica de
+  Catalunya, iMinds and Fraunhofer) and supporting NGOs (Pangea and the OPLAN
+  Foundation). *##*
 - Its mission is to support the sustainable growth of CNs by providing the
   means to conduct experimentally driven research.
 - It also supports other projects advancing or extending CNs via financed Open
   Calls. *##* Here you can see the list of the projects selected for Open
   Call 1, and more than fifteen are now being selected for Open Call 2. *##*

Index: slides,lightning.txt
==================================================================
--- slides,lightning.txt
+++ slides,lightning.txt
@@ -12,15 +12,15 @@
     - Mutual agreement texts
 - Key for EU Digital Agenda
 
 # … distributed ownership (1/3)
 
-![Private network and Internet access](imgs/network-private.png)
+![Public network, private Internet access](imgs/network-public.png)
 
 # … distributed ownership (2/3)
 
-![Public network, private Internet access](imgs/network-public.png)
+![Private network and Internet access](imgs/network-private.png)
 
 # … distributed ownership (3/3)
 
 ![Community network, assorted services](imgs/network-community.png)
 
@@ -27,11 +27,11 @@
 # Community networks (CNs)
 
 - Broadband self-provision
 - Similar to Free software:
     - Open participation & management,  
-      distributed ownership
+      distributed ownership (public > private > community)
     - Open, Free, neutral networks  
     - Mutual agreement texts
 - Key for EU Digital Agenda
 
 # The CONFINE project
@@ -47,10 +47,13 @@
 ![CONFINE project partners](imgs/confine-partners.png)
 
 # The CONFINE project
 
 - Partners
+    - CNs: guifi.net, AWMN, Funkfeuer
+    - Research: UPC, iMinds, FKIE
+    - NGOs: Pangea, OPLAN
 - Support sustainable growth of CNs via research  
   (technologies & services)
 - Help other projects boost CNs (Open Calls) **[+]**
 - Provide a testbed for CNs: Community-Lab
 
@@ -73,10 +76,12 @@
 
 - Partners
 - Support sustainable growth of CNs via research  
   (technologies & services)
 - Help other projects boost CNs (Open Calls)
+    - 5 current ones
+    - 15+ more to come
 - Provide a testbed for CNs: Community-Lab
 
 # Community-Lab
 
 - A testbed built on community networks
@@ -92,21 +97,21 @@
     - Simple, tolerant to network failures
 - Free software: build your own testbed!
 
 # Community-Lab as community infrastructure
 
-- Extend CNs with Community-Lab nodes and links **[+]**
+- 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
+- Extend CNs (with Community-Lab nodes and links)
 - Community-Lab for hosting services
 - [Clommunity](http://clommunity-project.eu/): community clouds
 
 # Architecture and technologies