diff --git a/imgs/GC.jpg b/imgs/GC.jpg
new file mode 100644
index 0000000..a639805
Binary files /dev/null and b/imgs/GC.jpg differ
diff --git a/imgs/ai.png b/imgs/ai.png
new file mode 100644
index 0000000..e2c86ca
Binary files /dev/null and b/imgs/ai.png differ
diff --git a/imgs/ass_xm.jpg b/imgs/ass_xm.jpg
new file mode 100644
index 0000000..ab2a1f6
Binary files /dev/null and b/imgs/ass_xm.jpg differ
diff --git a/imgs/bseconda.jpg b/imgs/bseconda.jpg
index f53a159..f9382d0 100644
Binary files a/imgs/bseconda.jpg and b/imgs/bseconda.jpg differ
diff --git a/imgs/bterza.jpg b/imgs/bterza.jpg
new file mode 100644
index 0000000..1b60ccf
Binary files /dev/null and b/imgs/bterza.jpg differ
diff --git a/imgs/cardi.png b/imgs/cardi.png
new file mode 100644
index 0000000..2d7b4c0
Binary files /dev/null and b/imgs/cardi.png differ
diff --git a/imgs/ex_float.png b/imgs/ex_float.png
new file mode 100644
index 0000000..c0f16e0
Binary files /dev/null and b/imgs/ex_float.png differ
diff --git a/imgs/float.png b/imgs/float.png
index c0f16e0..2f9497a 100644
Binary files a/imgs/float.png and b/imgs/float.png differ
diff --git a/imgs/hm.png b/imgs/hm.png
new file mode 100644
index 0000000..0553d9d
Binary files /dev/null and b/imgs/hm.png differ
diff --git a/imgs/map.png b/imgs/map.png
new file mode 100644
index 0000000..8e46f55
Binary files /dev/null and b/imgs/map.png differ
diff --git a/imgs/zucchine.jpg b/imgs/zucchine.jpg
new file mode 100644
index 0000000..9c59a8d
Binary files /dev/null and b/imgs/zucchine.jpg differ
diff --git a/index.html b/index.html
index b9b03b1..05aed32 100644
--- a/index.html
+++ b/index.html
@@ -29,6 +29,9 @@
 div.fragment, ul.fragment{background: rgba(25,25,25,0.7);}
 li {
     padding: 0.4em 0;
+}
+ul#last li{
+	padding:0 0;
 }
 	</style>
 </head>
@@ -39,7 +42,8 @@ li {
 			<section data-background="./imgs/campo1.png">
 				<div class="fragment">
 				<h2>Infrastructures in a horizontal farmers community</h2>
-				Human agreements, comunication infrastructures<br/> Campi Aperti - Bologna - Italy
+				Human agreements, comunication infrastructures<br/> Campi Aperti - Bologna - Italy<br/><br/>
+				<small>36c3 - 2019</small>
 			</div>
 			</section>
 			<!--
@@ -73,19 +77,20 @@ li {
 					<li>FROM: Via Campesina, 1999 no global movement, radical anticapitalist background</li>
 			for keep humanity, safeguard the ambient, to know that there are stuffs without a price, </aside>
 			</section>
-			<section data-background="./imgs/xm24_web.png">
-					<div  class="fragment">	<h2>www.ecn.org/xm24</h2></div>
-			</section>
+
 							<section data-background="./imgs/xm.png">
 
 				<!--h2 class="fragment">Where?</h2-->
 				<div class="fragment">
 				<p>In shared public space: <br/></br>
-					squares and squats </br>
+					squares and squats </br></br>
 				<p>Campi Aperti was born in 2003 in XM24 in Bolognina</p>
 			</div>
 				<aside class="notes">xm24 is a self-managed public space in bolognina, exist more than 17 year old, now is under treat of eviction because is out the logic of profit, is not a service, is a community that selfmanaged herself. shared place in opposition of supermarkets and car-parkings</aside>
 			</section>
+			<section data-background="./imgs/xm24_web.png">
+					<div  class="fragment">	<h2>www.ecn.org/xm24</h2></div>
+			</section>
 			<section data-background="./imgs/xm2.png">
 				<!--h2>WHEN? </h2-->
 				<div class="fragment">
@@ -99,8 +104,14 @@ li {
 			</div>
 				<aside class="notes">WHEN , is not human-centric ,can't exist the emergency, you have to be prepared,  our time is gold, is circolar, is projects, is community, is story,normally when something is smart and quick, is not considering some variables...  </aside>
 			</section>
-			<section data-background-video="./imgs/CampiapertiStory.ogv">
-				<ul class="fragment">
+			<section data-background="./imgs/zucchine.jpg">
+			<a href="./imgs/CampiapertiStory.ogv">Video</a>
+
+
+			</section>
+			<section data-background="./imgs/GC.jpg">
+				<div  class="fragment">
+				<ul>
 					<li>food autonomy</li>
 					<li>agroecology</li>
 					<li>consensus method</li>
@@ -108,13 +119,14 @@ li {
 					<li>sense of limit</li>
 					<li>mutualism</li>
 				</ul>
-				<aside class="notes">HOW<li>food autonomy (those who live in the area decide what to grow, eat and produce)</li>
-				<li>agroecology, recognizing an ecosystem to be safeguarded</li>
-				<li>consensus method, not gerarchical relationship</li>
-				<li>shared warranty: participatory BIO certification!= centralized BIO certification</li>
-				<li>is like a web od trus: everyone of the farmers at every markets check the product of the other.. is easyer of what looklike, because we live in the valleys.. you see is a product come from th big distribution and not from a near filds</li>
-				<li>sense of limit, shared ideas and mutualism, understand the diversity, planned together</li>
-				<li>economy of relationship, based on knowledge and not competition</li></aside>
+			</div>
+			<aside class="notes">HOW<li>food autonomy (those who live in the area decide what to grow, eat and produce)</li>
+			<li>agroecology, recognizing an ecosystem to be safeguarded</li>
+			<li>consensus method, not gerarchical relationship</li>
+			<li>shared warranty: participatory BIO certification!= centralized BIO certification</li>
+			<li>is like a web od trus: everyone of the farmers at every markets check the product of the other.. is easyer of what looklike, because we live in the valleys.. you see is a product come from th big distribution and not from a near filds</li>
+			<li>sense of limit, shared ideas and mutualism, understand the diversity, planned together</li>
+			<li>economy of relationship, based on knowledge and not competition</li></aside>
 			</section>
 			<section data-background="./imgs/accordo_disaccordo.jpg">
 				<!--h3>Consensus method</h3-->
@@ -136,7 +148,7 @@ li {
 				<aside class="notes"> active dissent, means that the way that we are taking is against some principles</aside>
 			</section-->
 
-			<section>
+			<section data-background="./imgs/ass_xm.jpg">
 				<div class="fragment">
 				<h2>Our Shared agreements</h2>
 				<ul>
@@ -148,9 +160,11 @@ li {
 			</div>
 				<aside class="notes"> the base agreement are really important. </aside>
 			</section>
+			<section data-background="./imgs/hm.png">
+			</section>
 			<section data-background="./imgs/Ca_web.png">
-				<h2 class="fragment">Early Communication tools</h2>
 				<div class="fragment">
+				<h2>Early Communication tools</h2>
 				<ul>
 					<li>2003 - markets in the squares</li>
 					<li>2003 - mailing list: a lot of differente self-managed servers</li>
@@ -160,6 +174,7 @@ li {
 			</div>
 				<aside class="notes">AI is a antifascist/antisexist/antiracist server, more than 12 ml, more differents comunications tools, also commercial; we are 143 fearmers, probably a bit more than 1000 thousen people</aside>
 			</section>
+
 			<!--section>
 				<h2>Mesh network</h2>
 				<ul>
@@ -178,18 +193,27 @@ li {
 			<div class="fragment">	<h2 >https://ninux.org	</h2></div>
 			</section>
 			<section data-background="./imgs/antenne/2.jpg" >
+					<aside class="notes"></aside>
 			</section>
 			<section data-background="./imgs/antenne/3.jpg" data-background-size="550px">
+				<aside class="notes">					<li>Starting from march 2017</li>
+</aside>
 			</section>
 			<section data-background="./imgs/antenne/4.jpg">
+				<aside class="notes">				<li>8 nodes</li></aside>
 			</section>
 			<section data-background="./imgs/antenne/2.5.jpg">
+				<aside class="notes"><li>hardware: 15 people, 4 technicians, </li>
+</aside>
 			</section>
 			<section data-background="./imgs/antenne/7.jpg">
+				<aside class="notes">tplink, ubiquiti, librerouter.org, other recicled routers at 2.4 GHz</aside>
 			</section>
 			<section data-background="./imgs/antenne/8.jpg" data-background-size="550px">
+				<aside class="notes">software: libremesh.org (flavour of openwrt); routing protocols: batman adv and babeld</aside>
 			</section>
 			<section data-background="./imgs/antenne/9.jpg" data-background-size="550px" >
+				<aside class="notes"></aside>
 			</section>
 			<section data-background="./imgs/antenne/10.jpg">
 				<div class="fragment">
@@ -254,10 +278,10 @@ li {
 
 				<div class="fragment">
 									<h2>starting from our needs</h2>
-				<p>we started to speak about the INTIMACIES in 2016</p>
+				<p>we started to speak about our digital data in 2016</p>
 			<p>during Genuino Clandestino in Sardegna</p>
 		</div>
-				<aside class="notes"> is about the cards of shared warranty, where host them? Genuino clandestino is the human network of farmers in our peninsula and near islands, </aside>
+				<aside class="notes"> ANTI GAFAM- is about the cards of shared warranty, where host them? Genuino clandestino is the human network of farmers in our peninsula and near islands, </aside>
 			</section>
 			<section>
 				<h2>our DATA</h2>
@@ -265,31 +289,37 @@ li {
 					<li>find the server: tetaneutral.net (FFDN)</li>
 					<li>find the sysadmin people: 4</li>
 					<li>nextcloud</li>
-					<li>docker</li>
-					<li>ansible</li>
+					<!--li>docker-compose</li-->
+					<!--li>ansible</li-->
 					<li>1 year of testing</li>
 				</ul>
 				<aside class="notes">1 year of test, 3 months to find the people: an herbalist, a tecnician, an astrofisic, tetaneutral is for net neutrality, for the access to the internet, in inside the Federate France data Network, something that started near 20 years ago; is with a budget based on donations with a trasparent money report; we turn on the cloud in march and now we are usin gonly for administrative task, to distribute them, we are yet in time to change software and infra, we have to evaluate, but we have to think how grow and made plan</aside>
 			</section>
-
+<section data-background="./imgs/ai.png">
+</section>
 			<section data-background="./imgs/float.png">
-				<h2 class="fragment">Float</h2>
 				<div class="fragment">
+					<h2>Float</h2>
 				<p>a minimalistic container orchestrator by autistici.org</p>
-				<p>git.autistici.org/ai3/float</p>
-				<ul>
-					<li>static service allocation</li>
-					<li>1:1 instance/host mapping</li>
-					<li>manual port assignments</li>
-					<li>service discovery protocol</li>
-					<li>PKI management</li>
-					<li>builtin services</li>
-				</ul>
+				<p>https://git.autistici.org/ai3/float</p>
+				<!--ul>
+
+				</ul-->
 			</div>
-				<aside class="notes">Autistici is a self managed server from the 2001, privacy oriented,this year changed the Infrastructure. We decide to try to copy theri resistent infrastructure and because we have common need. we decided to not use big software like kibernetes, because need that someone of us became too specilize in that, it's too much code to review and check, because the comunity behind is different from our. we need small stuff, 1thousen line of python is enought! docker give the possibility to test all in local. the service scheduler does not move  containers at runtime in response to host failures, all changes happen at "configuration time" when running Ansible. the scheduler won't run more than one instance of a service on each host. there's no automatic allocation of ports.service discovery protocol DNS based. all service-to-service communication can be encrypted and authenticated using a private PKI. the toolkit provides a number of built-in monitoring services</aside>
+				<aside class="notes"><li>static service allocation</li>
+					<li>1:1 instance/host mapping</li>
+					<li>builtin services</li> privacy oriented,
+				<li>	 because the comunity behind is different from our. we need small stuff, 1thousen line of python is enought! </li>
+					 docker give the possibility to test . the service scheduler does not move  containers at runtime in response to host failures,
+					 all changes happen at "configuration time" when running Ansible. <br/>
+					 the scheduler won't run more than one instance of a service on each host.<br/>
+					   the toolkit provides a number of built-in monitoring services 	</aside>
+			</section>
+			<section data-background="./imgs/bterza.jpg">
 			</section>
 			<section data-background="./imgs/bseconda.jpg">
-<div class="fragment">				<ul>
+<div class="fragment">
+		<ul>
 					<li>move on bare metal</li>
 					<li>have a testing infrastructure</li>
 					<li>we trust the group and share their value</li>
@@ -301,15 +331,17 @@ li {
 			</div>
 				<aside class="notes">we have different need from companies, speaking with other sysadmin in the last 10 years the stuff became more and more sophysticate, layers over layers, wrapper inside other wrapper.. bee a sys admin is becaming a work of to be in line production-line, you miss the overview and you start to be afraids of the indterdependencies. this infrastructure give you the possibility to be modular, but specific, isolated the softwares but not entering in a view of manage the machine like an industry. the aim is do the best with less , not do the minimum with a lot of resources.we don't want have machines that are numbers, we have machines with names, like pet :) I think that float is the best compromise that we could find with the complexity of manage a comunication infrastructure and know that we are not alone, using also help another comunity, because in the freesoftware an important stuff is not to be alone and make alliances with the same aim.</aside>
 			</section>
-			<section>
+			<section data-background="./imgs/cardi.png">
+				<div class="fragment">
 				<h2>thanks</h2>
 				<p>questions?</p>
 				<small>CC 4 - by-nc-sa ; slide in reveal.js</small>
+			</div>
 				<aside class="notes"> </aside>
 			</section>
 			<section>
-				<h2>thanks to</h2>
-				<ul>
+				<p>thanks</p>
+				<ul id="last">
 					<li>campiaperti.org</li>
 					<li>ecn.org/xm24</li>
 					<li>autistici.org</li>
@@ -322,6 +354,9 @@ li {
 					<li>eclectictechcarnival.org</li>
 				</ul>				<aside class="notes"> </aside>
 			</section>
+
+
+
 		</div>
 	</div>
 
@@ -356,6 +391,13 @@ li {
 			]
 		});
 	</script>
+	<script>
+	var link = document.createElement( 'link' );
+	link.rel = 'stylesheet';
+	link.type = 'text/css';
+	link.href = window.location.search.match( /print-pdf/gi ) ? 'css/print/pdf.css' : 'css/print/paper.css';
+	document.getElementsByTagName( 'head' )[0].appendChild( link );
+</script>
 </body>
 
 </html>