diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo
index 16427d59..4ad100f6 100644
Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ
diff --git a/BrawlboxHelper/BrawlboxHelper.cs b/BrawlboxHelper/BrawlboxHelper.cs
index 63280327..84d242da 100644
--- a/BrawlboxHelper/BrawlboxHelper.cs
+++ b/BrawlboxHelper/BrawlboxHelper.cs
@@ -234,9 +234,10 @@ namespace BrawlboxHelper
             chr0.OriginalPath = fska.Path;
             chr0.UserEntries = new UserDataCollection();
             chr0.Loop = fska.Loop;
+            chr0.CreateEntry();
 
             foreach (var entry in fska.BoneAnims)
-                chr0.Children.Add(BoneAnim2Chr0Entry(entry, fska.FrameCount));
+                chr0.Children.Add(BoneAnim2Chr0Entry(entry, chr0));
 
             chr0.Export(FileName);
         }
@@ -250,10 +251,9 @@ namespace BrawlboxHelper
             public float Frame;
         }
 
-        public static CHR0EntryNode BoneAnim2Chr0Entry(BoneAnim boneAnim, int FrameCount)
+        public static CHR0EntryNode BoneAnim2Chr0Entry(BoneAnim boneAnim, CHR0Node chr0)
         {
-            CHR0EntryNode chr0Entry = new CHR0EntryNode();
-            chr0Entry.Name = boneAnim.Name;
+            CHR0EntryNode chr0Entry = chr0.CreateEntry(boneAnim.Name);
             chr0Entry.UseModelRotate = false;
             chr0Entry.UseModelScale = false;
             chr0Entry.UseModelTranslate = false;
@@ -392,7 +392,7 @@ namespace BrawlboxHelper
                 }
             }
 
-            for (int frame = 0; frame < FrameCount; frame++)
+            for (int frame = 0; frame < chr0.FrameCount; frame++)
             {
                 if (TranslateX.ContainsKey(frame))
                 {
diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
index 9c6cec77..37bd5763 100644
Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
index 6aeec5fd..d67d094f 100644
Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache differ