diff --git a/1623/161/france.htm b/1623/161/france.htm
index 3b89b35cf..a7bff65e9 100644
--- a/1623/161/france.htm
+++ b/1623/161/france.htm
@@ -29,16 +29,19 @@ France</h2></a>
 
 <h3>Overview</h3>
 
-<p><a href="/1623/others/l/161c.htm"><img alt="Entrance photo - 113k" width=200
-height=132 align=left hspace=10 vspace=10 src="/1623/others/t/161c.jpg"></a>
+<p>
+  <a href="/others/gscb/index.htm"><img alt="Survey of VSS2" width=200
+ align=right hspace=10 vspace=10 src="/others/gscb/vss2-161c-elev.jpg"></a> 
 This entrance was originally explored by the
-<a href="/others/gscb/index.htm">French</a> <b lang="fr">Groupe
+<a href="/others/gscb/index.htm">French GSCB</a> <b lang="fr">Groupe
 Sp&eacute;l&eacute;ologique de Clerval - Baume les Dames</b> under the
 name VSS2 in 1988 and 1989, reaching -285m at what is now called
 <a href="#titfieldt">Titfield Thunderbolt</a>. They abandoned exploration
 as it was apparent that it was going to connect into 161, though in fact,
 that connection at depth wasn't made until 1995 and entailed the discovery
-of a large amount of very impressive passage !<br clear=all>
+of a large amount of very impressive passage !
+  <a href="/1623/others/l/161c.htm"><img alt="Entrance photo - 113k" width=200
+height=132 align=left hspace=10 vspace=10 src="/1623/others/t/161c.jpg"></a><br clear=all>
 
 <p><b>France</b> was originally the name of a single
 chamber, but through common usage is now the term for this entire area which
diff --git a/entrance_data/1623-161b.html b/entrance_data/1623-161b.html
index abacfc3ec..b9a896bf9 100644
--- a/entrance_data/1623-161b.html
+++ b/entrance_data/1623-161b.html
@@ -1,20 +1,30 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
+<!-- This file is generated by troggle  using the form documented at handbook/survey/ententry.html -->
+<!-- If you edit this file by hand, and manually upload it to the server using git,
+make sure you update the database by doing a full data import. If you edit it using the online form
+though, you do not need to do a data import as it happens automatically -->
+
+    <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
+    <!-- there is 1 required field: slug. The entrance will not appear without that. -->
+    <!-- ALWAYS use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
+
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
+<b>This file is generated by troggle</b>  using the form documented at 
+<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
+<br>
 <entrance>
 <non_public>False</non_public>
-
-
-<name></name>
-<entrance_description></entrance_description>
+<slug>1623-161b</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>161b</name>
+<entrance_description><a  href="/1623/161/i/161b_entrance.jpg"><img src="/1623/161/i/161b_entrance.jpg" width=30%>Photo by Olly</a></entrance_description>
 <explorers>CUCC 1988-98</explorers>
-<map_description></map_description>
 <location_description></location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description><a href="offtop.htm#id161b">Click here for underground description</a></underground_description>
 <photo></photo>
@@ -36,14 +46,12 @@
 <findability>S</findability>
 <findability_description></findability_description>
 <alt></alt>
-<northing></northing>
-<easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station></tag_station>
-<exact_station></exact_station>
 <other_station>1623.p161b</other_station>
 <other_description></other_description>
-<bearings></bearings>
-<url>1623/161/161b.htm</url>
+<bearings></bearings> <!-- this is now read-only and not editable on the forms-->
 </entrance>
 </body>
 </html>
