diff --git a/CodeWalker.Core/GameFiles/FileTypes/YvrFile.cs b/CodeWalker.Core/GameFiles/FileTypes/YvrFile.cs
index 6c93216..eaf07a0 100644
--- a/CodeWalker.Core/GameFiles/FileTypes/YvrFile.cs
+++ b/CodeWalker.Core/GameFiles/FileTypes/YvrFile.cs
@@ -49,6 +49,13 @@ namespace CodeWalker.GameFiles
 
         }
 
+        public byte[] Save()
+        {
+            byte[] data = ResourceBuilder.Build(Records, 1); //yvr is type/version 1...
+
+            return data;
+        }
+
 
     }
 }
diff --git a/CodeWalker.Core/GameFiles/FileTypes/YwrFile.cs b/CodeWalker.Core/GameFiles/FileTypes/YwrFile.cs
index cace6fb..3e82b08 100644
--- a/CodeWalker.Core/GameFiles/FileTypes/YwrFile.cs
+++ b/CodeWalker.Core/GameFiles/FileTypes/YwrFile.cs
@@ -49,6 +49,13 @@ namespace CodeWalker.GameFiles
 
         }
 
+        public byte[] Save()
+        {
+            byte[] data = ResourceBuilder.Build(Waypoints, 1); //ywr is type/version 1...
+
+            return data;
+        }
+
 
     }
 }
diff --git a/CodeWalker.Core/GameFiles/Resources/WaypointRecord.cs b/CodeWalker.Core/GameFiles/Resources/WaypointRecord.cs
index 66af7db..96fc785 100644
--- a/CodeWalker.Core/GameFiles/Resources/WaypointRecord.cs
+++ b/CodeWalker.Core/GameFiles/Resources/WaypointRecord.cs
@@ -43,9 +43,9 @@ namespace CodeWalker.GameFiles
         {
             base.Write(writer, parameters);
 
-            //// update structure data
-            //this.EntriesPointer = (ulong)(this.Entries?.Position ?? 0);
-            //this.EntriesCount = (uint)(this.Entries?.Count ?? 0);
+            // update structure data
+            this.EntriesPointer = (ulong)(this.Entries?.FilePosition ?? 0);
+            this.EntriesCount = (uint)(this.Entries?.Count ?? 0);
 
             // write structure data
             writer.Write(this.Unknown_10h);