diff --git a/Locations/HamptonRoadsVirginia/HamptonRoadsVA.x3d b/Locations/HamptonRoadsVirginia/HamptonRoadsVA.x3d
index 73037cd2eeda46d70289c142b706db1aaa58d996..058bedc3712760b63894710bd086cf3b34ef61fd 100644
--- a/Locations/HamptonRoadsVirginia/HamptonRoadsVA.x3d
+++ b/Locations/HamptonRoadsVirginia/HamptonRoadsVA.x3d
@@ -15,10 +15,10 @@
   <Scene>
     <WorldInfo title='HamptonRoadsVA.x3d'/>
     <GeoLocation geoCoords='36.989999984839216 -76.99299996786561 0'>
+      <GeoOrigin DEF='ORIGIN' geoCoords='36.989999984839216 -76.99299996786561 0.0'/>
       <Transform rotation='0 0 0 2.815'>
         <Background skyColor='0.7 0.8 0.9'/>
       </Transform>
-      <GeoOrigin DEF='ORIGIN' geoCoords='36.989999984839216 -76.99299996786561 0.0'/>
       <!-- Need some major illumination -->
       <PointLight ambientIntensity='1' location='0 100000 0' radius='1000000'/>
     </GeoLocation>
diff --git a/Locations/MontereyBayCalifornia/MontereyBayLargeMeshGeospatial.x3d b/Locations/MontereyBayCalifornia/MontereyBayLargeMeshGeospatial.x3d
index 1d157a17da22b169a1314d16e31cf3a6745ee2ce..d1bfe898c6d0726d1f80958e6112d4ff4c1326e2 100644
--- a/Locations/MontereyBayCalifornia/MontereyBayLargeMeshGeospatial.x3d
+++ b/Locations/MontereyBayCalifornia/MontereyBayLargeMeshGeospatial.x3d
@@ -18,8 +18,8 @@
   <Scene>
     <WorldInfo title='MontereyBayLargeMeshGeospatial.x3d'/>
     <GeoLocation geoCoords='36.607 -121.885 0.0'>
-      <Inline url='"MontereyBayLargeMesh.x3d" "https://savage.nps.edu/Savage/Locations/MontereyBayCalifornia/MontereyBayLargeMesh.x3d"'/>
       <GeoOrigin DEF='DEPRECATED' geoCoords='36.607 -121.885 0.0' geoSystem='"GD"'/>
+      <Inline url='"MontereyBayLargeMesh.x3d" "https://savage.nps.edu/Savage/Locations/MontereyBayCalifornia/MontereyBayLargeMesh.x3d"'/>
     </GeoLocation>
   </Scene>
 </X3D>
\ No newline at end of file
diff --git a/Locations/NarragansettBayRhodeIslandBathymetry/NarragansettBayMerged.x3d b/Locations/NarragansettBayRhodeIslandBathymetry/NarragansettBayMerged.x3d
index c7367e10d1b30671b4b9fce4735b5bb0584d6f3c..ad88ef914b962fce28159af2c4847c0bf649df19 100644
--- a/Locations/NarragansettBayRhodeIslandBathymetry/NarragansettBayMerged.x3d
+++ b/Locations/NarragansettBayRhodeIslandBathymetry/NarragansettBayMerged.x3d
@@ -51,8 +51,8 @@
         <DirectionalLight/>
       </Transform>
       <GeoLocation geoCoords='41.56722223554018 -71.30572987125981 0'>
-        <DirectionalLight direction='0 -1 0' global='true'/>
         <GeoOrigin USE='ORIGIN'/>
+        <DirectionalLight direction='0 -1 0' global='true'/>
       </GeoLocation>
     </Switch>
   </Scene>
diff --git a/Locations/NarragansettBayRhodeIslandLarge/NarragansettBayGeospatialCoordinateAxesNsew.x3d b/Locations/NarragansettBayRhodeIslandLarge/NarragansettBayGeospatialCoordinateAxesNsew.x3d
index c184e5b85e527ce85532132a0e907c547cf69239..fb6790caa4f4919c9c944e3457e0e7983558e7ba 100644
--- a/Locations/NarragansettBayRhodeIslandLarge/NarragansettBayGeospatialCoordinateAxesNsew.x3d
+++ b/Locations/NarragansettBayRhodeIslandLarge/NarragansettBayGeospatialCoordinateAxesNsew.x3d
@@ -18,10 +18,10 @@
     <Inline DEF='NarragansettBayLarge' url='"NarragansettBayLarge.x3d" "https://savage.nps.edu/Savage/Locations/NarragansettBayRhodeIslandLarge/NarragansettBayLarge.x3d"'/>
     <Group>
       <GeoLocation geoCoords='41.56722223554018 -71.30572987125981 0'>
+        <GeoOrigin DEF='ORIGIN' geoCoords='41.5 -71.5 0' geoSystem='"GD"'/>
         <Transform DEF='CoordinateAxes' scale='3000 3000 3000'>
           <Inline url='"../../Tools/Authoring/CoordinateAxesNSEW.x3d" "https://savage.nps.edu/Savage/Tools/Authoring/CoordinateAxes.x3d"'/>
         </Transform>
-        <GeoOrigin DEF='ORIGIN' geoCoords='41.5 -71.5 0' geoSystem='"GD"'/>
       </GeoLocation>
     </Group>
   </Scene>
diff --git a/Locations/NarragansettBayRhodeIslandSmall/NarragansettBayGeospatialCoordinateAxesNsew.x3d b/Locations/NarragansettBayRhodeIslandSmall/NarragansettBayGeospatialCoordinateAxesNsew.x3d
index 17bf567d14e92d90d80cbe58edc8808b125c1368..936fe467a0ca496e5e2c764e57e8767f46558966 100644
--- a/Locations/NarragansettBayRhodeIslandSmall/NarragansettBayGeospatialCoordinateAxesNsew.x3d
+++ b/Locations/NarragansettBayRhodeIslandSmall/NarragansettBayGeospatialCoordinateAxesNsew.x3d
@@ -17,10 +17,10 @@
     <Inline DEF='NarragansettBaySmall' url='"NarragansettBaySmall.x3d" "https://savage.nps.edu/Savage/Locations/NarragansettBayRhodeIslandSmall/NarragansettBaySmall.x3d"'/>
     <!-- This GeoLocation block shows how to geospatially reference regular nongeospatial shapes -->
     <GeoLocation geoCoords='41.56722223554018 -71.30572987125981 0'>
+      <GeoOrigin DEF='ORIGIN' geoCoords='41.5 -71.5 0' geoSystem='"GD"'/>
       <Transform scale='1000 1000 1000'>
         <Inline DEF='CoordinateAxesNSEW' url='"../../Basic/course/CoordinateAxesNSEW.x3d" "CoordinateAxesNSEW.x3d" "https://x3dgraphics.com/examples/X3dForWebAuthors/Chapter03Grouping/CoordinateAxes.x3d"'/>
       </Transform>
-      <GeoOrigin DEF='ORIGIN' geoCoords='41.5 -71.5 0' geoSystem='"GD"'/>
     </GeoLocation>
   </Scene>
 </X3D>
\ No newline at end of file
diff --git a/Locations/StraitsOfMalaccaLarge/StraitsOfMalaccaGeospatialCargoShipAnimation.x3d b/Locations/StraitsOfMalaccaLarge/StraitsOfMalaccaGeospatialCargoShipAnimation.x3d
index 21a1e96f7dbac986ec2b90325118560ba5e3ee67..729bed033afbfc27c116559723a4f853c7bbcbe8 100644
--- a/Locations/StraitsOfMalaccaLarge/StraitsOfMalaccaGeospatialCargoShipAnimation.x3d
+++ b/Locations/StraitsOfMalaccaLarge/StraitsOfMalaccaGeospatialCargoShipAnimation.x3d
@@ -20,10 +20,10 @@
     <Inline DEF='StraitsOfMalaccaWayPoints' url='"StraitsOfMalaccaWayPoints.x3d" "https://savage.nps.edu/Savage/Locations/StraitsOfMalaccaLarge/StraitsOfMalaccaWayPoints.x3d"'/>
     <Group>
       <GeoLocation geoCoords='0.3471685463819618 100.89750038406439 0'>
+        <GeoOrigin DEF='ORIGIN' geoCoords='0.3471685463819618 100.89750038406439 0' geoSystem='"GD"'/>
         <Transform DEF='CoordinateAxes' scale='50000 50000 50000'>
           <Inline url='"../../Tools/Authoring/CoordinateAxesNSEW.x3d" "https://savage.nps.edu/Savage/Tools/Authoring/CoordinateAxes.x3d"'/>
         </Transform>
-        <GeoOrigin DEF='ORIGIN' geoCoords='0.3471685463819618 100.89750038406439 0' geoSystem='"GD"'/>
       </GeoLocation>
     </Group>
   </Scene>
diff --git a/Locations/StraitsOfMalaccaLarge/StraitsOfMalaccaGeospatialCoordinateAxesNsew.x3d b/Locations/StraitsOfMalaccaLarge/StraitsOfMalaccaGeospatialCoordinateAxesNsew.x3d
index 48e50cc00781537226e424c0bf7df341dd8b3f4f..c20801fa373c99a3bb3b3e16bf7820d05aedcacd 100644
--- a/Locations/StraitsOfMalaccaLarge/StraitsOfMalaccaGeospatialCoordinateAxesNsew.x3d
+++ b/Locations/StraitsOfMalaccaLarge/StraitsOfMalaccaGeospatialCoordinateAxesNsew.x3d
@@ -19,10 +19,10 @@
     <Inline DEF='StraitsOfMalaccaLarge' url='"StraitsOfMalaccaLarge.x3d" "https://savage.nps.edu/Savage/Locations/StraitsOfMalaccaLarge/StraitsOfMalaccaLarge.x3d"'/>
     <Group>
       <GeoLocation geoCoords='0.3471685463819618 100.89750038406439 0'>
+        <GeoOrigin DEF='ORIGIN' geoCoords='0.3471685463819618 100.89750038406439 0' geoSystem='"GD"'/>
         <Transform DEF='CoordinateAxes' scale='50000 50000 50000'>
           <Inline url='"../../Tools/Authoring/CoordinateAxesNSEW.x3d" "https://savage.nps.edu/Savage/Tools/Authoring/CoordinateAxes.x3d"'/>
         </Transform>
-        <GeoOrigin DEF='ORIGIN' geoCoords='0.3471685463819618 100.89750038406439 0' geoSystem='"GD"'/>
       </GeoLocation>
     </Group>
   </Scene>
diff --git a/Locations/StraitsOfMalaccaLarge/StraitsOfMalaccaWayPoints.x3d b/Locations/StraitsOfMalaccaLarge/StraitsOfMalaccaWayPoints.x3d
index afb88c7c1b1bffa54a91f6d9fe371fade92a67da..afe38468bf34b77c5d63d45c727d8fc8885cddcb 100644
--- a/Locations/StraitsOfMalaccaLarge/StraitsOfMalaccaWayPoints.x3d
+++ b/Locations/StraitsOfMalaccaLarge/StraitsOfMalaccaWayPoints.x3d
@@ -20,16 +20,16 @@
       <GeoOrigin DEF='ORIGIN' geoCoords='0.3471685463819618 100.89750038406439 0' geoSystem='"GD"'/>
     </GeoViewpoint>
     <GeoLocation DEF='ContainerShipRed' geoCoords='0.8869992941 92.8767804884 0'>
+      <GeoOrigin USE='ORIGIN'/>
       <Transform DEF='ContainerShipRedAxis' scale='300 300 300'>
         <Inline url='"../../ShipsCivilian/CargoShips/ContainerShipRed.x3d" "https://savage.nps.edu/Savage/ShipsCivilian/CargoShips/ContainerShipRed.x3d"'/>
       </Transform>
-      <GeoOrigin USE='ORIGIN'/>
     </GeoLocation>
     <GeoLocation DEF='ContainerShipBlue' geoCoords='8.2849709007 96.2388926211 0'>
+      <GeoOrigin USE='ORIGIN'/>
       <Transform DEF='ContainerShipBlueAxis' scale='300 300 300'>
         <Inline url='"../../ShipsCivilian/CargoShips/ContainerShipBlue.x3d" "https://savage.nps.edu/Savage/ShipsCivilian/CargoShips/ContainerShipBlue.x3d"'/>
       </Transform>
-      <GeoOrigin USE='ORIGIN'/>
     </GeoLocation>
     <GeoTransform geoCenter='0.3471685463819618 100.89750038406439 0' translation='0 2000 0'>
       <Shape>
diff --git a/Locations/StraitsOfMalaccaSmall/StraitsOfMalaccaGeospatialCoordinateAxesNsew.x3d b/Locations/StraitsOfMalaccaSmall/StraitsOfMalaccaGeospatialCoordinateAxesNsew.x3d
index 00f124e157c00ee00d62ad241239b05f56780808..defd3f0a0c8786b30853fe255cad2da928513633 100644
--- a/Locations/StraitsOfMalaccaSmall/StraitsOfMalaccaGeospatialCoordinateAxesNsew.x3d
+++ b/Locations/StraitsOfMalaccaSmall/StraitsOfMalaccaGeospatialCoordinateAxesNsew.x3d
@@ -19,10 +19,10 @@
     <Inline DEF='StraitsOfMalaccaSmall' url='"StraitsOfMalaccaSmall.x3d" "https://savage.nps.edu/Savage/Locations/StraitsOfMalaccaSmall/StraitsOfMalaccaSmall.x3d"'/>
     <Group>
       <GeoLocation geoCoords='3.070985940057265 102.12856265864148 0'>
+        <GeoOrigin DEF='ORIGIN' geoCoords='3.070985940057265 102.12856265864148 0' geoSystem='"GD"'/>
         <Transform DEF='CoordinateAxes' scale='30000 30000 30000'>
           <Inline url='"../../Tools/Authoring/CoordinateAxesNSEW.x3d" "https://savage.nps.edu/Savage/Tools/Authoring/CoordinateAxes.x3d"'/>
         </Transform>
-        <GeoOrigin DEF='ORIGIN' geoCoords='3.070985940057265 102.12856265864148 0' geoSystem='"GD"'/>
       </GeoLocation>
     </Group>
   </Scene>