diff --git a/010 Templates/mske.bt b/010 Templates/mske.bt
index 6db7fef..b683c16 100644
--- a/010 Templates/mske.bt	
+++ b/010 Templates/mske.bt	
@@ -18,10 +18,10 @@ Header Header_<name="Header">;
 // Entries
 typedef struct {
     float Duration<name="Duration (float)">;
-    float Extension<name="Extension (float)">;
     float M1_Duration<name="M1 Duration (float)">;
-    float M1_Extension<name="M1 Extension (float)">;
     float M2_Duration<name="M2 Duration (float)">;
+    float Extension<name="Extension (float)">;
+    float M1_Extension<name="M1 Extension (float)">;
     float M2_Extension<name="M2 Extension (float)">;
     float Effect<name="Effect (float)">;
     float Recast_Effect<name="Recast Effect (float)">;
diff --git a/Generated/MHW_Editor/Structs/PlData/PlMusicSkillParam.cs b/Generated/MHW_Editor/Structs/PlData/PlMusicSkillParam.cs
index 530674b..3098db2 100644
--- a/Generated/MHW_Editor/Structs/PlData/PlMusicSkillParam.cs
+++ b/Generated/MHW_Editor/Structs/PlData/PlMusicSkillParam.cs
@@ -133,24 +133,9 @@ public virtual float Duration {
                 }
             }
 
-            protected float Extension_raw;
-            public const string Extension_displayName = "Extension";
-            public const int Extension_sortIndex = 100;
-            [SortOrder(Extension_sortIndex)]
-            [DisplayName(Extension_displayName)]
-            public virtual float Extension {
-                get => Extension_raw;
-                set {
-                    if (Extension_raw == value) return;
-                    Extension_raw = value;
-                    ChangedItems.Add(nameof(Extension));
-                    OnPropertyChanged(nameof(Extension));
-                }
-            }
-
             protected float M1_Duration_raw;
             public const string M1_Duration_displayName = "M1 Duration";
-            public const int M1_Duration_sortIndex = 150;
+            public const int M1_Duration_sortIndex = 100;
             [SortOrder(M1_Duration_sortIndex)]
             [DisplayName(M1_Duration_displayName)]
             public virtual float M1_Duration {
@@ -163,24 +148,9 @@ public virtual float M1_Duration {
                 }
             }
 
-            protected float M1_Extension_raw;
-            public const string M1_Extension_displayName = "M1 Extension";
-            public const int M1_Extension_sortIndex = 200;
-            [SortOrder(M1_Extension_sortIndex)]
-            [DisplayName(M1_Extension_displayName)]
-            public virtual float M1_Extension {
-                get => M1_Extension_raw;
-                set {
-                    if (M1_Extension_raw == value) return;
-                    M1_Extension_raw = value;
-                    ChangedItems.Add(nameof(M1_Extension));
-                    OnPropertyChanged(nameof(M1_Extension));
-                }
-            }
-
             protected float M2_Duration_raw;
             public const string M2_Duration_displayName = "M2 Duration";
-            public const int M2_Duration_sortIndex = 250;
+            public const int M2_Duration_sortIndex = 150;
             [SortOrder(M2_Duration_sortIndex)]
             [DisplayName(M2_Duration_displayName)]
             public virtual float M2_Duration {
@@ -193,6 +163,36 @@ public virtual float M2_Duration {
                 }
             }
 
+            protected float Extension_raw;
+            public const string Extension_displayName = "Extension";
+            public const int Extension_sortIndex = 200;
+            [SortOrder(Extension_sortIndex)]
+            [DisplayName(Extension_displayName)]
+            public virtual float Extension {
+                get => Extension_raw;
+                set {
+                    if (Extension_raw == value) return;
+                    Extension_raw = value;
+                    ChangedItems.Add(nameof(Extension));
+                    OnPropertyChanged(nameof(Extension));
+                }
+            }
+
+            protected float M1_Extension_raw;
+            public const string M1_Extension_displayName = "M1 Extension";
+            public const int M1_Extension_sortIndex = 250;
+            [SortOrder(M1_Extension_sortIndex)]
+            [DisplayName(M1_Extension_displayName)]
+            public virtual float M1_Extension {
+                get => M1_Extension_raw;
+                set {
+                    if (M1_Extension_raw == value) return;
+                    M1_Extension_raw = value;
+                    ChangedItems.Add(nameof(M1_Extension));
+                    OnPropertyChanged(nameof(M1_Extension));
+                }
+            }
+
             protected float M2_Extension_raw;
             public const string M2_Extension_displayName = "M2 Extension";
             public const int M2_Extension_sortIndex = 300;
@@ -344,10 +344,10 @@ public static Entries LoadData(BinaryReader reader, ulong i) {
                 var data = new Entries();
                 data.Index = i;
                 data.Duration_raw = reader.ReadSingle();
-                data.Extension_raw = reader.ReadSingle();
                 data.M1_Duration_raw = reader.ReadSingle();
-                data.M1_Extension_raw = reader.ReadSingle();
                 data.M2_Duration_raw = reader.ReadSingle();
+                data.Extension_raw = reader.ReadSingle();
+                data.M1_Extension_raw = reader.ReadSingle();
                 data.M2_Extension_raw = reader.ReadSingle();
                 data.Effect_raw = reader.ReadSingle();
                 data.Recast_Effect_raw = reader.ReadSingle();
@@ -362,10 +362,10 @@ public static Entries LoadData(BinaryReader reader, ulong i) {
 
             public void WriteData(BinaryWriter writer) {
                 writer.Write(Duration_raw);
-                writer.Write(Extension_raw);
                 writer.Write(M1_Duration_raw);
-                writer.Write(M1_Extension_raw);
                 writer.Write(M2_Duration_raw);
+                writer.Write(Extension_raw);
+                writer.Write(M1_Extension_raw);
                 writer.Write(M2_Extension_raw);
                 writer.Write(Effect_raw);
                 writer.Write(Recast_Effect_raw);
diff --git a/MHW-Generator/PlData/PlMusicSkillParam.cs b/MHW-Generator/PlData/PlMusicSkillParam.cs
index 21c8fa2..4184aad 100644
--- a/MHW-Generator/PlData/PlMusicSkillParam.cs
+++ b/MHW-Generator/PlData/PlMusicSkillParam.cs
@@ -16,10 +16,10 @@ public MultiStruct Generate() { // .mske
 
                 new MhwMultiStructData.StructData("Entries", new List<MhwMultiStructData.Entry> {
                     new MhwMultiStructData.Entry("Duration", typeof(float)),
-                    new MhwMultiStructData.Entry("Extension", typeof(float)),
                     new MhwMultiStructData.Entry("M1 Duration", typeof(float)),
-                    new MhwMultiStructData.Entry("M1 Extension", typeof(float)),
                     new MhwMultiStructData.Entry("M2 Duration", typeof(float)),
+                    new MhwMultiStructData.Entry("Extension", typeof(float)),
+                    new MhwMultiStructData.Entry("M1 Extension", typeof(float)),
                     new MhwMultiStructData.Entry("M2 Extension", typeof(float)),
                     new MhwMultiStructData.Entry("Effect", typeof(float)),
                     new MhwMultiStructData.Entry("Recast Effect", typeof(float)),