diff --git a/html/tutorial/tutorial1/server.html b/html/tutorial/tutorial1/server.html
index 155cfd233aeb17b82c5cd698e453b8a48761616b..424adcd785b9b17137487a29b412347bed790dc7 100644
--- a/html/tutorial/tutorial1/server.html
+++ b/html/tutorial/tutorial1/server.html
@@ -47,15 +47,55 @@ div.logic {
 Here is an illustration of the <A href="index.html">Alignment API
     tutorial</a> using the alignment server.</p>
 <small>This tutorial has been designed for the Alignment API version
-  3.0. Actual screendumps may vary since the interface has evolved
-  but the functionalities remain.</small>
+  3.0 and updated for the Alignment API 4.0. Actual screendumps may
+  vary since the interface has evolved but the functionalities remain.</small>
 	
 <h2>Launching the alignment server for the first time</h2>
 
 <p>This tutorial can be used by locally launching an Alignment server
   or by using a publicly available Alignment server. We explain here
   how to install the alignment server.</p>
-	
+<p>
+Installing the Alignment server requires a jdbc-compliant relational
+database. Here we use MySQL. Drivers for Postgres are also available
+from the release.
+</p>
+<p>
+Setting up the server requires to create a database. This is achieved
+through the following instructions:
+<div class="fragment">
+$ sudo /usr/local/mysql/bin/mysqld_safe --user=mysql &
+$ /usr/local/mysql/bin/mysqladmin -u root password <mysqlpassword>
+$ /usr/local/mysql/bin/mysqladmin -u root -h localhost password <mysqlpassword>
+$ /usr/local/mysql/bin/mysql -u root -p<mysqlpassword>
+sql> CREATE DATABASE AServDB;
+sql> GRANT ALL PRIVILEGES ON AServDB.* TO adminAServ@localhost IDENTIFIED BY 'aaa345';
+sql> quit
+</div>
+Of course, it is advised to use different user, password and database name. This can be achieved either:
+<ul>
+<li>by changing values of <tt>DBMSBASE</tt>, <tt>DBMSUSER</tt> and <tt>DBMSPASS</tt> in AlignmentServer and recompiling;</li>
+<li>by passing parameters dbmsbase, dbmsuser and dbmspass to AlignmentServer.</li>
+</ul>
+</p>
+
+<p>
+Once this done, the server can be launched through command line by:
+<div class="fragment">
+$ java -jar lib/alignsvc.jar -H
+</div>
+for a minimal HTML server, or
+<div class="fragment">
+$ java -jar lib/alignsvc.jar -Ddbmsbase=MyDB -Dwndict=../WordNet-3.0/dict -H -W -d 4
+</div>
+for a more complete server with specific database, access to wordnet set, webservices and
+debug.
+The alignment server is then available by HTTP through:
+<center>
+<a href="http://localhost:8089/html/">http://localhost:8089/html/</a>
+</center>
+</p>
+
 <h2>Connecting through the server with an HTTP client</h2>
 	
 <p>Once the server has been installed, it can be accessed using
@@ -82,7 +122,7 @@ You can browse in these menus to see what is available.</p>
 	
 <p>Your first matching task can be achieved by selecting the "Match
   ontology" button in the user menu:
-<center><img src="server/matching1.png" /></center>
+<center><img src="server/match1.png" /></center>
 As most of the tasks through the Alignment server, it provides a
 result under that form:
 <center><img src="server/result1.png" /></center>
@@ -144,9 +184,23 @@ Trimming, as most operations in the server, generate a new alignment:
 <div class="logic"><p><b>More work:</b> There is another switch (<tt>-T</tt>) in Procalign that specifies the way a threshold is applied (hard|perc|prop|best|span) the default being "hard". The curious reader can apply these and see the difference in results. How they work is explained in the Alignment <abbr>API</abbr> documentation.</p></div>
 
 <p><b>Other manipulations:</b> It is possible to invert an alignment
-  by using the </p>
+  by using the invert button of the main menu or the one provided
+  directly after results. This provides the following interface:</p>
 <center><img src="server/invert1.png" /></center>
 	
+<h2>Searching alignments</h2>
+	
+<p>The list of alignments available from the server can by obtained
+  from the main menu and gives:
+<center><img src="server/list1.png" /></center>
+It is also possible to look for alignments between specific ontologies
+through the Find button of the main menu. This present the following
+interface:
+<center><img src="server/find1.png" /></center>
+which returns the following result:
+<center><img src="server/list2.png" /></center>
+</p>
+
 <h2>Output</h2>
 	
 <p>From the server, it is possible to generate all the formats
@@ -166,18 +220,26 @@ Or in XSLT:
 <center><img src="server/format3.png" width="100%" /></center>
 </p>
 	
-<h2>Evaluating</h2>
+<h2>Loading and storing</h2>
 	
-<p><b>This part is not yet available through the server</b></p>
+<p>
+It is possible to load an alignment available somewhere on the web
+or on a disk through:
+<center><img src="server/load1.png" /></center>
+which returns:
+<center><img src="server/result2.png" width="100%" /></center>
+</p>
+<p>
+An alignment can be stored definitely on the server, i.e., its
+database through the Store button of the main menu which triggers the
+following interface:
+<center><img src="server/store1.png" width="100%" /></center>
+</p>
 
-<h2>Embedding</h2>
+<h2>Evaluating</h2>
 	
-<p>If you want to embed matching solutions in an applications, then
-  you should look at the <a href="index.html">genuine
-  tutorial</a>.</p>
+<p><b>This part is not yet available through the server</b></p>
 
-<p><b>TODO: Explain embedding of a matching system in the alignment server.</b></p>
-	
 <h2>Further exercises</h2>
 	
 <p>More info: <a href="http://alignapi.gforge.inria.fr">http://alignapi.gforge.inria.fr</a></p>
@@ -189,15 +251,11 @@ Planning:
 - Expressive alignment language (with SEKT/Fran篩s Sharffe)
 -->
 	
-<h2>Acknowledgements</h2>
-	
-<p>The format of this tutorial has been shamelessly borrowed from Sean Bechhofer's <a href="http://owl.man.ac.uk/2005/07/sssw/"><acronym>OWL</acronym> tutorial</a>.</p>	
-
 <hr />
 <small>
 <p style="text-align: center;">http://alignapi.gforge.inria.fr/tutorial//tutorial1/server.html</p>
-</small>
 <hr />
-<p>$Id$</p>
+<div>$Id$</div>
+</small>
 </body>
 </html>
diff --git a/html/tutorial/tutorial1/server/align1.png b/html/tutorial/tutorial1/server/align1.png
index 924f7ad07c3c8b350012254df6a3fa7484fc3380..a0ae068f57d7dc092efe870b3d28ab37617fdc09 100644
Binary files a/html/tutorial/tutorial1/server/align1.png and b/html/tutorial/tutorial1/server/align1.png differ
diff --git a/html/tutorial/tutorial1/server/align2.png b/html/tutorial/tutorial1/server/align2.png
index e302c8afd69c8a43ecd89565ef67650ae5259c11..fbca6202e5e22ab3ffc1865db924f94deb4a13ee 100644
Binary files a/html/tutorial/tutorial1/server/align2.png and b/html/tutorial/tutorial1/server/align2.png differ
diff --git a/html/tutorial/tutorial1/server/align3.png b/html/tutorial/tutorial1/server/align3.png
index 79877d2fbe0958e039b94454af7494507123887e..70fe0bc5193d0ebf4dc253621c26f6638b52b958 100644
Binary files a/html/tutorial/tutorial1/server/align3.png and b/html/tutorial/tutorial1/server/align3.png differ
diff --git a/html/tutorial/tutorial1/server/align4.png b/html/tutorial/tutorial1/server/align4.png
index d812ae419710b86b1aa7608bc7541c74e7b8ec96..e8dcd9725459a38728a421ac5de845e1347a7b83 100644
Binary files a/html/tutorial/tutorial1/server/align4.png and b/html/tutorial/tutorial1/server/align4.png differ
diff --git a/html/tutorial/tutorial1/server/align5.png b/html/tutorial/tutorial1/server/align5.png
index 0fb394180e5d62fba2d0ab8026e8421e9dcabf93..cc4bd6cacfe0c4a302521fd3bfb19cd4fe79b783 100644
Binary files a/html/tutorial/tutorial1/server/align5.png and b/html/tutorial/tutorial1/server/align5.png differ
diff --git a/html/tutorial/tutorial1/server/find1.png b/html/tutorial/tutorial1/server/find1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a41906543b800f005c64a41d85f62eb08783bba
Binary files /dev/null and b/html/tutorial/tutorial1/server/find1.png differ
diff --git a/html/tutorial/tutorial1/server/format1.png b/html/tutorial/tutorial1/server/format1.png
index a24166313ff47a76c6ddd80615f685e1e6e7ad90..27ddd160d94cd1262ad2a843966b8a5712fcb4fe 100644
Binary files a/html/tutorial/tutorial1/server/format1.png and b/html/tutorial/tutorial1/server/format1.png differ
diff --git a/html/tutorial/tutorial1/server/format2.png b/html/tutorial/tutorial1/server/format2.png
index d41ed5bb844ab3f51007c99d5d436bf22b6be4ea..a955869cecbd2b35fd2ca8040a464d78fec11208 100644
Binary files a/html/tutorial/tutorial1/server/format2.png and b/html/tutorial/tutorial1/server/format2.png differ
diff --git a/html/tutorial/tutorial1/server/format3.png b/html/tutorial/tutorial1/server/format3.png
index 72928517e8db02a2dda85e0fecbf9a4173560639..6368acf8b772aea96086ae4be9b15f49ba0c78f9 100644
Binary files a/html/tutorial/tutorial1/server/format3.png and b/html/tutorial/tutorial1/server/format3.png differ
diff --git a/html/tutorial/tutorial1/server/interf.png b/html/tutorial/tutorial1/server/interf.png
index 0cc228c5a01dc72c0bf193570a5501018976d60b..ca137b2be8cdf581c786732cf91bd463a39e5f54 100644
Binary files a/html/tutorial/tutorial1/server/interf.png and b/html/tutorial/tutorial1/server/interf.png differ
diff --git a/html/tutorial/tutorial1/server/interf2.png b/html/tutorial/tutorial1/server/interf2.png
index a712fb2f6b81dd3445cd7ccf9b54c861ce83b159..30859439d438ba1a4af76ded0eebd6c70143e825 100644
Binary files a/html/tutorial/tutorial1/server/interf2.png and b/html/tutorial/tutorial1/server/interf2.png differ
diff --git a/html/tutorial/tutorial1/server/invert1.png b/html/tutorial/tutorial1/server/invert1.png
index 84fe05ae98e54edff795165499028e2d78b6b1df..acfb1671e318c83e448bde222deacd0108bcf33b 100644
Binary files a/html/tutorial/tutorial1/server/invert1.png and b/html/tutorial/tutorial1/server/invert1.png differ
diff --git a/html/tutorial/tutorial1/server/list1.png b/html/tutorial/tutorial1/server/list1.png
new file mode 100644
index 0000000000000000000000000000000000000000..234092c8e3bb0b67da3f046d24b172b05730b06f
Binary files /dev/null and b/html/tutorial/tutorial1/server/list1.png differ
diff --git a/html/tutorial/tutorial1/server/list2.png b/html/tutorial/tutorial1/server/list2.png
new file mode 100644
index 0000000000000000000000000000000000000000..07d17e1087ba51cf16510babe80524f90239dd77
Binary files /dev/null and b/html/tutorial/tutorial1/server/list2.png differ
diff --git a/html/tutorial/tutorial1/server/load1.png b/html/tutorial/tutorial1/server/load1.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6e0f2fc762d1db206b0e24bf2d596113ea7ce73
Binary files /dev/null and b/html/tutorial/tutorial1/server/load1.png differ
diff --git a/html/tutorial/tutorial1/server/match1.png b/html/tutorial/tutorial1/server/match1.png
new file mode 100644
index 0000000000000000000000000000000000000000..18eb134c10c97624d044a95a05be7582477ef831
Binary files /dev/null and b/html/tutorial/tutorial1/server/match1.png differ
diff --git a/html/tutorial/tutorial1/server/match2.png b/html/tutorial/tutorial1/server/match2.png
index 2372f5bc96a6bccd0ff4cc836f9958d1359f445a..861bd6b7398fa8f4526576a5e57e6509f5fe6143 100644
Binary files a/html/tutorial/tutorial1/server/match2.png and b/html/tutorial/tutorial1/server/match2.png differ
diff --git a/html/tutorial/tutorial1/server/match3.png b/html/tutorial/tutorial1/server/match3.png
index c83c393ac0160601583f84f575d5302cd05912a3..b61000543554fcb99ba3dc7cbdb3845ec3210d17 100644
Binary files a/html/tutorial/tutorial1/server/match3.png and b/html/tutorial/tutorial1/server/match3.png differ
diff --git a/html/tutorial/tutorial1/server/matching1.png b/html/tutorial/tutorial1/server/matching1.png
deleted file mode 100644
index 6ed2d00a2fc6aee6c847675415302d37d760add7..0000000000000000000000000000000000000000
Binary files a/html/tutorial/tutorial1/server/matching1.png and /dev/null differ
diff --git a/html/tutorial/tutorial1/server/result1.png b/html/tutorial/tutorial1/server/result1.png
index b6f29baf16b55ff36e54f96a87f615fc430fa2c8..a1563f9e824f79a0e44d5db33e45c1c31f4d225b 100644
Binary files a/html/tutorial/tutorial1/server/result1.png and b/html/tutorial/tutorial1/server/result1.png differ
diff --git a/html/tutorial/tutorial1/server/result2.png b/html/tutorial/tutorial1/server/result2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5700205dd83ea319e022de034706fad504a0da2d
Binary files /dev/null and b/html/tutorial/tutorial1/server/result2.png differ
diff --git a/html/tutorial/tutorial1/server/retr1.png b/html/tutorial/tutorial1/server/retr1.png
index ebc1ba730d9a90e8cf1a4edb6eec6c1863effddd..fcf23dd6740c9a629e7c72e3649fe7459cbdddff 100644
Binary files a/html/tutorial/tutorial1/server/retr1.png and b/html/tutorial/tutorial1/server/retr1.png differ
diff --git a/html/tutorial/tutorial1/server/retr2.png b/html/tutorial/tutorial1/server/retr2.png
index 7f7a79df30490f171e15bb68e8c2481f734f39bb..b228259f2fe19b0cc221d834d12c78522d81b671 100644
Binary files a/html/tutorial/tutorial1/server/retr2.png and b/html/tutorial/tutorial1/server/retr2.png differ
diff --git a/html/tutorial/tutorial1/server/retr3.png b/html/tutorial/tutorial1/server/retr3.png
index 8d66ec667f07e1d041bece2b8ad2ce7e1defb68b..d0e1613b9bae29a57dd5616c541f04171b7a0a0d 100644
Binary files a/html/tutorial/tutorial1/server/retr3.png and b/html/tutorial/tutorial1/server/retr3.png differ
diff --git a/html/tutorial/tutorial1/server/store1.png b/html/tutorial/tutorial1/server/store1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b032b5665666e745563c3c34bbf853deb28afbb5
Binary files /dev/null and b/html/tutorial/tutorial1/server/store1.png differ
diff --git a/html/tutorial/tutorial1/server/trim1.png b/html/tutorial/tutorial1/server/trim1.png
index 53528a96633233fc55b2bf3804fc36e2ac857930..f2c6cd15ede2d14330af7ad6cf1588436bcd4d32 100644
Binary files a/html/tutorial/tutorial1/server/trim1.png and b/html/tutorial/tutorial1/server/trim1.png differ