diff --git a/cave_data/1623-225.html b/cave_data/1623-225.html
index 99eef27c1..a3ef46cf8 100644
--- a/cave_data/1623-225.html
+++ b/cave_data/1623-225.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-225</caveslug>
+
 <official_name>Jahrzehnschacht</official_name>
 <area>1623</area>
-<area>2c</area>
 <kataster_code>1/S +</kataster_code>
 <kataster_number>225</kataster_number> 
 <unofficial_number>90 ADAM</unofficial_number>
@@ -22,19 +30,17 @@
 </entrance>
 
 <explorers>CUCC 1990 (by Adam Cooper on 12/7/1990)</explorers>
+<survex_file>caves-1623/225/225.svx</survex_file>
 <underground_description>The obvious pit by the "high level" route to 161 was descended using IRT (indestructible rope technique) after declining to use a Bunda belay. Ended at about -12m (choked as usual) with a ledge about halfway down.</underground_description>
 <equipment><20m rope presumably.</equipment>
 <references></references>
 <survey></survey>
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line>
 <notes></notes>
 <length></length>
 <depth></depth>
 <extent></extent>
-<survex_file>caves-1623/225/225.svx</survex_file>
+
 <description_file></description_file>
-<url>1623/225/225.html</url>
 </cave>
 </body>
 </html>
diff --git a/entrance_data/1623-225.html b/entrance_data/1623-225.html
index 7efbf9a13..ab5757c71 100644
--- a/entrance_data/1623-225.html
+++ b/entrance_data/1623-225.html
@@ -1,23 +1,35 @@
 <!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-225</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>225</name>
 <entrance_description></entrance_description>
 <explorers></explorers>
-<map_description></map_description>
 <location_description>The cave lies right beside the old high-level path to 161 (on the right as you head up to 161), on a section where you're walking over soil-like stuff between bunde bushes.  It's just near the ankle-breaking hole.</location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
-<photo></p> <table class="imgtable"> <tr><td><a href="225vw.jpg"><img src="225vw_small.jpg"></a></td><td><a href="wkent.jpg"><img src="wkent_small.jpg" /></a></td><td><a href="ent.jpg"><img src="ent_small.jpg"></a></td></tr><tr class="caption"><td>View from entrance area (&copy; Olly Betts 1990)</td><td>Wookey at the entrance (&copy; Dave Loeffler 2005)</td><td>Entrance shaft (&copy; Dave Loeffler 2005)</td></tr></table><p></photo>
+<photo></p> <table class="imgtable"> <tr><td><a href="225vw.jpg"><img src="225vw_small.jpg"></a></td><td><a href="wkent.jpg"><img src="wkent_small.jpg" /></a></td><td><a href="ent.jpg"><img src="ent_small.jpg"></a></td></tr><tr class="caption"><td>View from entrance area (&copy; Olly Betts 1990)</td><td>Wookey at the entrance (&copy; Dave Loeffler 2005)</td><td>Entrance shaft (&copy; Dave Loeffler 2005)</td></tr></table><p>
+<a href='/1623/225/l/IMG_20250718_102252.html'><img src='/1623/225/t/IMG_20250718_102252.jpg' /></a>&nbsp;
+<a href='/1623/225/l/IMG_20250718_102302.html'><img src='/1623/225/t/IMG_20250718_102302.jpg' /></a>&nbsp;</photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
@@ -28,7 +40,7 @@
                       U  = Unmarked,
                       ?  = Unknown" -->
 <marking>T</marking> 
-<marking_comment>Tagged 2005-08-01. Tag hilti not actually set!</marking_comment>
+<marking_comment>Tagged 2005-08-01. Tag hilti not actually set! Tag in 2025 says "1623 225 CUCC 1990"</marking_comment>
 <!-- findability options: ? = To be confirmed ...,
                           S = Surveyed,
                           L = Lost,
@@ -36,14 +48,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.p225</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>


View from entrance area (© Olly Betts 1990)	Wookey at the entrance (© Dave Loeffler 2005)	Entrance shaft (© Dave Loeffler 2005)