diff --git a/cave_data/1623-2006-70.html b/cave_data/1623-2006-70.html
index f1975a767..28c209cdc 100644
--- a/cave_data/1623-2006-70.html
+++ b/cave_data/1623-2006-70.html
@@ -1,17 +1,25 @@
 <!DOCTYPE html>
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
+<!-- If you edit this 162x-nnn.html 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 -->
 <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
+the form documented at 
+<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
+<br>
+
 <cave>
 <non_public>False</non_public>
-<caveslug>1623-2006-70</caveslug>
+
 <official_name>Cairn Cave</official_name>
 <area>1623</area>
-<area>1c</area>
 <kataster_code>1/S/T +</kataster_code>
 <kataster_number></kataster_number> 
 <unofficial_number>2006-70</unofficial_number>
@@ -22,19 +30,17 @@
 </entrance>
 
 <explorers>CUCC 2006 (Jenny + Olly)</explorers>
+<survex_file>caves-1623/2006-70/2006-70.svx</survex_file>
 <underground_description>Crawling/stooping horizontal entrance that draughts out. After ~10m there is a restricted pitch head that appears to open out onto a ~5m pitch.  The pitch head is awkward, then bells out to land on a rubble floor with a dirty snowplug. A chink of light enters upslope from a nearby shaft, while downslope the roof lowers and chokes.</underground_description>
 <equipment></equipment>
 <references>2006 logbook</references>
 <survey></survey>
-<kataster_status></kataster_status>
-<underground_centre_line>In dataset</underground_centre_line>
 <notes></notes>
 <length></length>
 <depth></depth>
 <extent></extent>
-<survex_file>caves-1623/2006-70/2006-70.svx</survex_file>
+
 <description_file></description_file>
-<url>1623/2006-70/2006-70.html</url>
 </cave>
 </body>
 </html>
diff --git a/entrance_data/1623-2006-70.html b/entrance_data/1623-2006-70.html
index 28ea37744..85d564a09 100644
--- a/entrance_data/1623-2006-70.html
+++ b/entrance_data/1623-2006-70.html
@@ -1,23 +1,36 @@
 <!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>
+<slug>1623-2006-70</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>2006-70</name>
 <entrance_description></entrance_description>
 <explorers>CUCC: Olly Betts</explorers>
-<map_description></map_description>
 <location_description>Not far from <a href="/1623/148/148.html">148</a>, right next to a cairn on the 2006 variant of the path from the col to 76</location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
-<photo></p><div class="centre"><a href="2006-70.jpg"><img alt="entrance photo" src="2006-70_small.jpg" /></a></div><p>Photo &copy; Olly Betts 2006</photo>
+<photo></p><div class="centre"><a href="2006-70.jpg"><img alt="entrance photo" src="2006-70_small.jpg" /></a></div><p>Photo &copy; Olly Betts 2006
+<p><a href='/1623/2006-70/l/2006-07-tag.html'><img src='/1623/2006-70/t/2006-07-tag.jpg' /></a> 
+  <a href='/1623/2006-70/l/2006-07-ent.html'><img src='/1623/2006-70/t/2006-07-ent.jpg' /></a> 
+  <br /> Photos in 2025</photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
@@ -36,14 +49,12 @@
 <findability>S</findability>
 <findability_description></findability_description>
 <alt></alt>
-<northing></northing>
-<easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station>1623.p2006-70</tag_station>
-<exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
-<bearings></bearings>
-<url></url>
+<bearings></bearings> <!-- this is now read-only and not editable on the forms-->
 </entrance>
 </body>
 </html>
