diff --git a/cave_data/1623-2006-01.html b/cave_data/1623-2006-01.html
index 8923e84ce..98287bdfb 100644
--- a/cave_data/1623-2006-01.html
+++ b/cave_data/1623-2006-01.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-01</caveslug>
+
 <official_name></official_name>
 <area>1623</area>
-<area>2d</area>
 <kataster_code>0/S -</kataster_code>
 <kataster_number></kataster_number> 
 <unofficial_number>2006-01</unofficial_number>
@@ -22,19 +30,17 @@
 </entrance>
 
 <explorers>Almost certainly seen before, but tagged CUCC 2006</explorers>
+<survex_file></survex_file>
 <underground_description>Undescended. Noticeable cold outward draught, but comes in noticeable gusts, so may be wind blowing through from another nearby entrance.</underground_description>
 <equipment></equipment>
 <references>2006 logbook</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/2006-01/2006-01.html</url>
 </cave>
 </body>
 </html>
diff --git a/entrance_data/1623-2006-01.html b/entrance_data/1623-2006-01.html
index a75c704ff..263eb9fea 100644
--- a/entrance_data/1623-2006-01.html
+++ b/entrance_data/1623-2006-01.html
@@ -1,23 +1,40 @@
 <!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-01</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>2006-01</name>
 <entrance_description></entrance_description>
 <explorers></explorers>
-<map_description></map_description>
 <location_description></location_description>
-<approach>Towards the end of the slabs on the 204 walkin, just after the narrow gully climb, taking a route slightly further down (the other side of a large bunde patch) one encounters this large surface shaft. </approach>
-<underground_description></underground_description>
-<photo></p> <div class="centre"> <a href="ent.jpg"><img src="ent_small.jpg" /></a></div><p>Photo &copy; Mark Shinwell 2006. Model: Aaron Curtis</photo>
+<lastvisit></lastvisit>
+<approach>Towards the end of the slabs on the 204 walkin, just after the narrow gully climb, taking a route slightly further down (the other side of a large bunde patch) one encounters this large surface shaft. 
+<p></approach>
+<underground_description>UNDESCENDED</underground_description>
+<photo></p> <div class="centre"> <a href="ent.jpg"><img src="ent_small.jpg" /></a></div><p>Photo &copy; Mark Shinwell 2006. Model: Aaron Curtis
+<br>
+<a href='/1623/2006-01/l/IMG_20250723_150321.html'><img src='/1623/2006-01/t/IMG_20250723_150321.jpg' /></a>&nbsp;
+
+<a href='/1623/2006-01/l/IMG_20250723_150342.html'><img src='/1623/2006-01/t/IMG_20250723_150342.jpg' /></a>&nbsp;
+
+<a href='/1623/2006-01/l/IMG_20250723_150334.html'><img src='/1623/2006-01/t/IMG_20250723_150334.jpg' /></a>&nbsp;</photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
@@ -28,22 +45,20 @@
                       U  = Unmarked,
                       ?  = Unknown" -->
 <marking>U</marking> 
-<marking_comment>No record of a tag being placed</marking_comment>
+<marking_comment>No record of a tag being placed, but a tag is there "CUCC 2006 01"</marking_comment>
 <!-- findability options: ? = To be confirmed ...,
                           S = Surveyed,
                           L = Lost,
                           R = Refindable" -->
 <findability>S</findability>
-<findability_description></findability_description>
+<findability_description>The GPS fix is accurate, confirmed 2025.</findability_description>
 <alt></alt>
-<northing></northing>
-<easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station>1623.gps06.2006-01</tag_station>
-<exact_station></exact_station>
 <other_station></other_station>
-<other_description></other_description>
-<bearings></bearings>
-<url></url>
+<other_description>Seen and photographed in 2025.<a href="/logbookentry/2025-07-23/2025-07-23a">2025-07-23a</a>.</other_description>
+<bearings></bearings> <!-- this is now read-only and not editable on the forms-->
 </entrance>
 </body>
 </html>
