diff --git a/cave_data/1623-2005-06.html b/cave_data/1623-2005-06.html
index c1744a86e..1e1dd11c5 100644
--- a/cave_data/1623-2005-06.html
+++ b/cave_data/1623-2005-06.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-2005-06</caveslug>
+
 <official_name>L Shaft</official_name>
 <area>1623</area>
-<area>2d</area>
 <kataster_code>1/S -</kataster_code>
 <kataster_number></kataster_number> 
 <unofficial_number>2005-06</unofficial_number>
@@ -22,19 +30,17 @@
 </entrance>
 
 <explorers>Entrance noted CUCC 2002 (Duncan). Refound + partially explored CUCC 2005 (Peter + Phil)</explorers>
+<survex_file></survex_file>
 <underground_description></underground_description>
 <equipment></equipment>
 <references>Brief description and sketch in 2002#31; <a href="/years/2005/logbook.html#t2005-08-10A">2005 log book</a></references>
 <survey></survey>
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line>
 <notes></notes>
 <length></length>
 <depth></depth>
 <extent></extent>
-<survex_file></survex_file>
+
 <description_file></description_file>
-<url>1623/2005-06/2005-06.html</url>
 </cave>
 </body>
 </html>
diff --git a/entrance_data/1623-2005-06.html b/entrance_data/1623-2005-06.html
index 032d12f98..e54f081ff 100644
--- a/entrance_data/1623-2005-06.html
+++ b/entrance_data/1623-2005-06.html
@@ -1,22 +1,32 @@
 <!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>L-shaped shaft entrance, around 15m deep. Needs a ladder / rope.</entrance_description>
-<explorers></explorers>
-<map_description></map_description>
+<slug>1623-2005-06</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>2005-06</name>
+<entrance_description>L-shaped shaft entrance, around 15m deep. Steps/ledges from E - W end to floor at bottom of rift, after right angle of L.</entrance_description>
+<explorers>Joel, Jonty, Becka and Buck revisited this shaft in 2025</explorers>
 <location_description></location_description>
+<lastvisit>2025-07-02</lastvisit>
 <approach></approach>
-<underground_description></underground_description>
+<underground_description>Long rift mostly open to surface with a choked continuation at base of E end - not possible to go further.</underground_description>
 <photo></p><table class="imgtable"><tr><td><a href="philent.jpg"><img src="philent_small.jpg" /></a></td><td><a href="ent.jpg"><img src="ent_small.jpg" /></a></td><td><a href="shaft.jpg"><img src="shaft_small.jpg" /></a></td></tr><tr class="caption"><td>Phil at the entrance</td><td>Entrance</td><td>Looking down shaft</td></table><p>Photos &copy; Peter Clifton 2005</photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
@@ -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.p2005-06</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>
