diff --git a/KKdBaseLib/Auth2D.cs b/KKdBaseLib/Auth2D.cs
index e914075..20bd074 100644
--- a/KKdBaseLib/Auth2D.cs
+++ b/KKdBaseLib/Auth2D.cs
@@ -16,12 +16,29 @@ namespace KKdBaseLib.Auth2D
         public uint BackColor;
         public uint Width;
         public uint Height;
-        public Pointer<Vec2<CountPointer<KFT2>>> Camera;
+        public Pointer<Camera> Camera;
         public CountPointer<Composition> Composition;
         public CountPointer<Video      > Video;
         public CountPointer<Audio      > Audio;
     }
 
+    public struct Camera
+    {
+        public CountPointer<KFT2>       EyeX;
+        public CountPointer<KFT2>       EyeY;
+        public CountPointer<KFT2>       EyeZ;
+        public CountPointer<KFT2>  PositionX;
+        public CountPointer<KFT2>  PositionY;
+        public CountPointer<KFT2>  PositionZ;
+        public CountPointer<KFT2> DirectionX;
+        public CountPointer<KFT2> DirectionY;
+        public CountPointer<KFT2> DirectionZ;
+        public CountPointer<KFT2>  RotationX;
+        public CountPointer<KFT2>  RotationY;
+        public CountPointer<KFT2>  RotationZ;
+        public CountPointer<KFT2>      Zoom ;
+    }
+
     public struct Composition
     {
         public int P;
diff --git a/KKdBaseLib/Auth3D.cs b/KKdBaseLib/Auth3D.cs
index 3a81e7b..fcaf81d 100644
--- a/KKdBaseLib/Auth3D.cs
+++ b/KKdBaseLib/Auth3D.cs
@@ -142,6 +142,9 @@ namespace KKdBaseLib.Auth3D
         public float? Max;
         public float Value;
         public bool RawData;
+        public bool RawDataBinary;
+        public int? RawDataValueListSize;
+        public int? RawDataValueListOffset;
         public KFT3[] Keys;
 
         public Key(A3DAKey k)
@@ -150,6 +153,9 @@ namespace KKdBaseLib.Auth3D
             Value = 0;
             BinOffset = null;
             RawData = default;
+            RawDataBinary = default;
+            RawDataValueListSize = null;
+            RawDataValueListOffset = null;
             Keys = null;
 
             EPTypePost = k.EPTypePost;
diff --git a/KKdBaseLib/KKdBaseLib.csproj b/KKdBaseLib/KKdBaseLib.csproj
index af36aed..7623f95 100644
--- a/KKdBaseLib/KKdBaseLib.csproj
+++ b/KKdBaseLib/KKdBaseLib.csproj
@@ -4,14 +4,14 @@
     <Authors>korenkonder</Authors>
     <Company></Company>
     <Configuration></Configuration>
-    <Copyright>korenkonder (C) 2019-2022</Copyright>
+    <Copyright>korenkonder (C) 2019-2024</Copyright>
     <Description>A base library</Description>
-    <FileVersion>0.4.10.12</FileVersion>
+    <FileVersion>0.4.11.0</FileVersion>
     <PackageId>KKdBaseLib</PackageId>
     <Product>KKdBaseLib</Product>
     <TargetFramework>net461</TargetFramework>
     <Title>KKdBaseLib</Title>
-    <Version>0.4.10.12</Version>
+    <Version>0.4.11.0</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/KKdMainLib/A3DA.cs b/KKdMainLib/A3DA.cs
index cd01010..b472f9a 100644
--- a/KKdMainLib/A3DA.cs
+++ b/KKdMainLib/A3DA.cs
@@ -5,7 +5,6 @@ using KKdBaseLib.Auth3D;
 using KKdMainLib.IO;
 using Object = KKdBaseLib.Auth3D.Object;
 using A3DADict = System.Collections.Generic.Dictionary<string, object>;
-using UsedDict = System.Collections.Generic.Dictionary<   int, KKdBaseLib.KeyValuePair<int, float>>;
 
 namespace KKdMainLib
 {
@@ -1075,7 +1074,7 @@ namespace KKdMainLib
         private Key RK(string str)
         {
             Key key = new Key();
-            if ( dict.FV(out key.BinOffset, str + BO     )) return  key;
+            if ( dict.FV(out key.BinOffset, str + BO     )) return key;
             if (!dict.FV(out int type     , str + ".type")) return default;
 
             key.Type = (KeyType)type;
@@ -1095,11 +1094,24 @@ namespace KKdMainLib
 
             if (keyType != 0)
             {
+                dict.FV(out string  valueType, str + ".raw_data.value_type");
+                dict.FV(out int valueListSize, str + ".raw_data.value_list_size");
+
+                if (dict.FV(out int valueListOffset, str + ".raw_data.value_list_offset"))
+                {
+                    if (keyType != 3)
+                        return default;
+
+                    key.RawData       = true;
+                    key.RawDataBinary = true;
+                    key.RawDataValueListSize   = valueListSize;
+                    key.RawDataValueListOffset = valueListOffset;
+                    return key;
+                }
+
                 string[] VL = null;
-                dict.FV(out string value_type, str + ".raw_data.value_type");
                 if (dict.FV(out value, str + ".raw_data.value_list"))
                     VL = value.Split(',');
-                dict.FV(out int valueListSize, str + ".raw_data.value_list_size");
                 value = "";
 
                 int ds = keyType + 1;
@@ -1180,7 +1192,7 @@ namespace KKdMainLib
 
         private void W(ref Key key, string str, bool a3dc)
         {
-            if (a3dc) { W(str + BO, key.BinOffset); return; }
+            if (a3dc && !(key.RawData && key.RawDataBinary)) { W(str + BO, key.BinOffset); return; }
 
             int i = 0;
             if (key.Type < KeyType.Linear || key.Keys == null || (key.Keys != null && key.Keys.Length == 0))
@@ -1216,30 +1228,37 @@ namespace KKdMainLib
             else if (key.Keys != null)
             {
                 int length = key.Keys.Length;
-                int keyType = 0;
-                IKF kf;
                 W(str + ".max", (float)(key.Max ?? Data.PlayControl.Size));
-                for (i = 0; i < length && keyType < 3; i++)
+                int keyType = 0;
+                if (key.RawDataBinary)
                 {
-                    kf = key.Keys[i].Check();
-                         if (kf is KFT0 && keyType < 0) keyType = 0;
-                    else if (kf is KFT1 && keyType < 1) keyType = 1;
-                    else if (kf is KFT2 && keyType < 2) keyType = 2;
-                    else if (kf is KFT3 && keyType < 3) keyType = 3;
+                    W(str + ".raw_data.value_list_offset", key.RawDataValueListOffset);
+                    keyType = 3;
                 }
-                int valueListSize = length * keyType + length;
-                s.W(str + ".raw_data.value_list=");
-                     if (keyType == 0) for (i = 0; i < length; i++)
-                        s.W(key.Keys[i].ToT0().ToString(false) + (i + 1 < length ? "," : ""));
-                else if (keyType == 1) for (i = 0; i < length; i++)
-                        s.W(key.Keys[i].ToT1().ToString(false) + (i + 1 < length ? "," : ""));
-                else if (keyType == 2) for (i = 0; i < length; i++)
-                        s.W(key.Keys[i].ToT2().ToString(false) + (i + 1 < length ? "," : ""));
-                else if (keyType == 3) for (i = 0; i < length; i++)
-                        s.W(key.Keys[i]       .ToString(false) + (i + 1 < length ? "," : ""));
-                s.P--;
-                s.W('\n');
-                W(str + ".raw_data.value_list_size", valueListSize);
+                else
+                {
+                    for (i = 0; i < length && keyType < 3; i++)
+                    {
+                        IKF kf = key.Keys[i].Check();
+                             if (kf is KFT0 && keyType < 0) keyType = 0;
+                        else if (kf is KFT1 && keyType < 1) keyType = 1;
+                        else if (kf is KFT2 && keyType < 2) keyType = 2;
+                        else if (kf is KFT3 && keyType < 3) keyType = 3;
+                    }
+
+                    s.W(str + ".raw_data.value_list=");
+                         if (keyType == 0) for (i = 0; i < length; i++)
+                            s.W(key.Keys[i].ToT0().ToString(false) + (i + 1 < length ? "," : ""));
+                    else if (keyType == 1) for (i = 0; i < length; i++)
+                            s.W(key.Keys[i].ToT1().ToString(false) + (i + 1 < length ? "," : ""));
+                    else if (keyType == 2) for (i = 0; i < length; i++)
+                            s.W(key.Keys[i].ToT2().ToString(false) + (i + 1 < length ? "," : ""));
+                    else if (keyType == 3) for (i = 0; i < length; i++)
+                            s.W(key.Keys[i]       .ToString(false) + (i + 1 < length ? "," : ""));
+                    s.P--;
+                    s.W('\n');
+                }
+                W(str + ".raw_data.value_list_size", length * keyType + length);
                 W(str + ".raw_data.value_type"     , "float"      );
                 W(str + ".raw_data_key_type"       , keyType      );
                 W(str + ".type", (int)key.Type);
@@ -1673,14 +1692,15 @@ namespace KKdMainLib
 
         private void RMT(ref ModelTransform mt)
         {
-            if (mt.BinOffset == null) return;
+            if (mt.BinOffset.HasValue)
+            {
+                s.P = (int)mt.BinOffset;
 
-            s.P = (int)mt.BinOffset;
-
-            ReadOffset(out mt.Scale);
-            ReadOffset(out mt.Rot  );
-            ReadOffset(out mt.Trans);
-            mt.Visibility = new Key { BinOffset = s.RI32() };
+                ReadOffset(out mt.Scale);
+                ReadOffset(out mt.Rot);
+                ReadOffset(out mt.Trans);
+                mt.Visibility = new Key { BinOffset = s.RI32() };
+            }
 
             RV3(ref mt.Scale     );
             RV3(ref mt.Rot       , true);
@@ -1705,15 +1725,32 @@ namespace KKdMainLib
 
         private void RK(ref Key key, bool f16 = false)
         {
+            int length;
+            if (key.RawData)
+            {
+                if (!key.RawDataBinary)
+                    return;
+
+                s.P = (int)key.RawDataValueListOffset;
+                key.RawDataValueListOffset = 0;
+
+                length = (int)key.RawDataValueListSize / 4;
+                key.Keys = new KFT3[length];
+                for (int i = 0; i < key.Keys.Length; i++)
+                { ref KFT3 kf = ref key.Keys[i]; Vec4 v = s.RV4(); kf.F  = v.X; kf.V  = v.Y;
+                                                                   kf.T1 = v.Z; kf.T2 = v.W; }
+                return;
+            }
+
             if (key.BinOffset == null || key.BinOffset < 0) return;
 
             s.P = (int)key.BinOffset;
-            int Type = s.RI32();
+            int Type  = s.RI32();
             key.Value = s.RF32();
             key.Type = (KeyType)(Type & 0xFF);
             if (key.Type < KeyType.Linear) return;
-            key.Max    = s.RF32();
-            int length = s.RI32();
+            key.Max = s.RF32();
+            length  = s.RI32();
             key.EPTypePost = (EPType)((Type >> 12) & 0xF);
             key.EPTypePre  = (EPType)((Type >>  8) & 0xF);
             key.Keys = new KFT3[length];
@@ -1774,6 +1811,17 @@ namespace KKdMainLib
 
         private void W(ref Key key, bool f16 = false)
         {
+            if (key.RawData) {
+                if (!key.RawDataBinary)
+                    return;
+
+                key.RawDataValueListOffset = s.P;
+                key.RawDataValueListSize = key.Keys.Length * 4;
+                for (i = 0; i < key.Keys.Length; i++)
+                { ref KFT3 kf = ref key.Keys[i]; s.W(new Vec4(kf.F, kf.V, kf.T1, kf.T2)); }
+                return;
+            }
+
             key.BinOffset = s.P;
             if (key.Type > KeyType.Static && key.Keys != null)
             {
@@ -2906,7 +2954,8 @@ namespace KKdMainLib
             if (key.Type == 0) { key.Value = 0; return key; }
             else if (key.Type < KeyType.Linear) return key;
 
-            key.RawData = msgPack.RB("RawData");
+            key.RawData       = msgPack.RB("RawData");
+            key.RawDataBinary = msgPack.RB("RawDataBinary");
             MsgPack trans;
             if ((trans = msgPack["Keys", true]).IsNull && (trans = msgPack["Trans", true]).IsNull) return key;
 
@@ -2982,7 +3031,8 @@ namespace KKdMainLib
                 if (key.EPTypePre != EPType.None)
                     keys.Add("EPTypePre", key.EPTypePre.ToString());
 
-                if (key.RawData) keys.Add("RawData", true);
+                if (key.RawData      ) keys.Add("RawData"      , true);
+                if (key.RawDataBinary) keys.Add("RawDataBinary", true);
 
                 int length = key.Keys.Length;
                 MsgPack Keys = new MsgPack(length, "Keys");
diff --git a/KKdMainLib/Aet.cs b/KKdMainLib/Aet.cs
index e318dcf..a9a4a48 100644
--- a/KKdMainLib/Aet.cs
+++ b/KKdMainLib/Aet.cs
@@ -8,7 +8,6 @@ namespace KKdMainLib
 {
     public struct Aet : System.IDisposable
     {
-        private int i, i0, i1, i2;
         private Stream s;
         private const string x00 = "\0";
 
@@ -19,14 +18,127 @@ namespace KKdMainLib
             AET = default;
             s = File.OpenReader(file + ".bin", true);
 
-            int i = 0;
             int Pos = -1;
-            while (true) { Pos = s.RI32(); if (Pos != 0 && Pos < s.L) i++; else break; }
+            int count = 0;
+            while (true) { Pos = s.RI32(); if (Pos != 0 && Pos < s.L) count++; else break; }
 
             s.P = 0;
-            AET.Scenes = new Pointer<Scene>[i];
-            for (i = 0; i < AET.Scenes.Length; i++) AET.Scenes[i] = s.RP<Scene>();
-            for (i = 0; i < AET.Scenes.Length; i++) AETReader(ref AET.Scenes[i]);
+            AET.Scenes = new Pointer<Scene>[count];
+            for (int i = 0; i < AET.Scenes.Length; i++) AET.Scenes[i] = s.RP<Scene>();
+            for (int i = 0; i < AET.Scenes.Length; i++)
+            {
+                ref Pointer<Scene> aetData = ref AET.Scenes[i];
+
+                s.P = aetData.O;
+                ref Scene aet = ref aetData.V;
+
+                aet.Name = s.RPS();
+                aet.StartFrame  = s.RF32();
+                aet.EndFrame    = s.RF32();
+                aet.FrameRate   = s.RF32();
+                aet.BackColor   = s.RU32();
+                aet.Width       = s.RU32();
+                aet.Height      = s.RU32();
+                aet.Camera      = s.RP<Camera>();
+                aet.Composition = s.RCP<Composition>();
+                aet.Video       = s.RCP<Video      >();
+                aet.Audio       = s.RCP<Audio      >();
+
+                if (aet.Camera.O > 0)
+                {
+                    s.P = aet.Camera.O;
+                    ref Camera camera = ref aet.Camera.V;
+                    camera.      EyeX.O = s.RI32();
+                    camera.      EyeY.O = s.RI32();
+                    camera.      EyeZ.O = s.RI32();
+                    camera. PositionX.O = s.RI32();
+                    camera. PositionY.O = s.RI32();
+                    camera. PositionZ.O = s.RI32();
+                    camera.DirectionX.O = s.RI32();
+                    camera.DirectionY.O = s.RI32();
+                    camera.DirectionZ.O = s.RI32();
+                    camera. RotationX.O = s.RI32();
+                    camera. RotationY.O = s.RI32();
+                    camera. RotationZ.O = s.RI32();
+                    camera.     Zoom .O = s.RI32();
+                    RKF(ref camera.      EyeX);
+                    RKF(ref camera.      EyeY);
+                    RKF(ref camera.      EyeZ);
+                    RKF(ref camera. PositionX);
+                    RKF(ref camera. PositionY);
+                    RKF(ref camera. PositionZ);
+                    RKF(ref camera.DirectionX);
+                    RKF(ref camera.DirectionY);
+                    RKF(ref camera.DirectionZ);
+                    RKF(ref camera. RotationX);
+                    RKF(ref camera. RotationY);
+                    RKF(ref camera. RotationZ);
+                    RKF(ref camera.     Zoom );
+                }
+
+                if (aet.Audio.O > 0)
+                {
+                    s.P = aet.Audio.O;
+                    for (int j = 0; j < aet.Audio.C; j++)
+                    {
+                        ref Audio aif = ref aet.Audio.E[j];
+                        aif.O = s.P;
+                        aif.SoundID = s.RU32();
+                    }
+                }
+
+                s.P = aet.Composition.O;
+                for (int j = 0; j < aet.Composition.C; j++)
+                    aet.Composition[j] = new Composition() { P = s.P, C = s.RI32(), O = s.RI32() };
+
+                int id = 0;
+                RAL(ref aet.Composition.E[aet.Composition.C - 1], ref id);
+                for (int j = 0; j < aet.Composition.C - 1; j++)
+                    RAL(ref aet.Composition.E[j], ref id);
+
+                s.P = aet.Video.O;
+                for (int j = 0; j < aet.Video.C; j++)
+                    aet.Video[j] = new Video { O = s.P, Color = s.RU32(), Width = s.RU16(),
+                        Height = s.RU16(), Frames = s.RF32(), Identifiers = s.RCP<Video.Identifier>() };
+
+                for (int j = 0; j < aet.Video.C; j++)
+                {
+                    s.P = aet.Video[j].Identifiers.O;
+                    for (int k = 0; k < aet.Video[j].Identifiers.C; k++)
+                        aet.Video.E[j].Identifiers[k] = new Video.Identifier { Name = s.RPS(), ID = s.RU32() };
+                }
+
+                for (int j = 0; j < aet.Composition.C; j++)
+                {
+                    for (int k = 0; k < aet.Composition[j].C; k++)
+                    {
+                        ref Layer obj = ref aet.Composition[j].E[k];
+                        obj.DataID = -1;
+                        int dataOffset = obj.VidItmOff;
+                        if (dataOffset > 0)
+                                 if (obj.Type == Layer.AetLayerType.Video      )
+                                for (int l = 0; l < aet.Video      .C; l++)
+                                { if (aet.Video      [l].O == dataOffset) { obj.DataID = l; break; } }
+                            else if (obj.Type == Layer.AetLayerType.Audio      )
+                                for (int l = 0; l < aet.Audio      .C; l++)
+                                { if (aet.Audio      [l].O == dataOffset) { obj.DataID = l; break; } }
+                            else if (obj.Type == Layer.AetLayerType.Composition)
+                                for (int l = 0; l < aet.Composition.C; l++)
+                                { if (aet.Composition[l].P == dataOffset) { obj.DataID = l; break; } }
+
+                        int parentLayer = obj.ParentLayer;
+                        if (parentLayer > 0)
+                            for (int l = 0; l < aet.Composition.C; l++)
+                            {
+                                for (int m = 0; m < aet.Composition[l].C; m++)
+                                    if (aet.Composition[l].E[m].Offset == parentLayer)
+                                    { obj.ParentLayer = aet.Composition[l].E[m].ID; break; }
+                                if (parentLayer != obj.ParentLayer) break;
+                            }
+                        if (parentLayer == obj.ParentLayer) obj.ParentLayer = -1;
+                    }
+                }
+            }
 
             s.C();
         }
@@ -36,10 +148,400 @@ namespace KKdMainLib
             if (AET.Scenes == null || AET.Scenes.Length == 0) return;
             s = File.OpenWriter();
 
+            s.P = (AET.Scenes.Length * 0x04).A(0x20);
+
+            System.Collections.Generic.Dictionary<string, int> usedValues =
+                new System.Collections.Generic.Dictionary<string, int>();
+
             for (int i = 0; i < AET.Scenes.Length; i++)
             {
-                s.P = s.L + 0x20;
-                AETWriter(ref AET.Scenes[i]);
+                ref Pointer<Scene> aetData = ref AET.Scenes[i];
+
+                ref Scene aet = ref aetData.V;
+
+                for (int j = 0; j < aet.Video.C; j++)
+                {
+                    ref Video region = ref aet.Video.E[j];
+                    if (region.Identifiers.C == 0) { region.Identifiers.O = 0; continue; }
+                    if (region.Identifiers.C > 1) s.A(0x20);
+                    region.Identifiers.O = s.P;
+                    for (int k = 0; k < region.Identifiers.C; k++) s.W(0L);
+                }
+
+                if (aet.Video.C > 1) s.A(0x20);
+                aet.Video.O = s.P;
+                for (int j = 0; j < aet.Video.C; j++)
+                {
+                    ref Video region = ref aet.Video.E[j];
+                    region.O = s.P;
+                    s.W(region.Color  );
+                    s.W(region.Width  );
+                    s.W(region.Height );
+                    s.W(region.Frames );
+                    s.W(region.Identifiers);
+                }
+
+                if (aet.Composition.C > 1) s.A(0x20);
+                aet.Composition.O = s.P;
+                for (int j = 0; j < aet.Composition.C; j++)
+                {
+                    aet.Composition.E[j].O = s.P;
+                    s.W(0L);
+                }
+
+                for (int j = 0; j < aet.Composition.C; j++)
+                {
+                    if (aet.Composition.E[j].C < 1) continue;
+
+                    for (int k = 0; k < aet.Composition.E[j].C; k++)
+                    {
+                        ref Layer obj = ref aet.Composition.E[j].E[k];
+                        if (obj.Marker.C > 0)
+                        {
+                            if (obj.Marker.C > 3) s.A(0x20);
+                            obj.Marker.O = s.P;
+                            for (int l = 0; l < obj.Marker.C; l++)
+                                s.W(0L);
+                        }
+
+                        if (obj.Video.O > 0)
+                        {
+                            ref VideoData video = ref obj.Video.V;
+                            if (video.Video3D.O > 0)
+                            {
+                                ref VideoData.Video3DData video3DData = ref video.Video3D.V;
+                                W(ref video3DData.   AnchorZ);
+                                W(ref video3DData. PositionZ);
+                                W(ref video3DData.DirectionX);
+                                W(ref video3DData.DirectionY);
+                                W(ref video3DData.DirectionZ);
+                                W(ref video3DData. RotationX);
+                                W(ref video3DData. RotationY);
+                                W(ref video3DData.    ScaleZ);
+                            }
+
+                            W(ref video.  AnchorX);
+                            W(ref video.  AnchorY);
+                            W(ref video.PositionX);
+                            W(ref video.PositionY);
+                            W(ref video.Rotation );
+                            W(ref video.   ScaleX);
+                            W(ref video.   ScaleY);
+                            W(ref video. Opacity );
+
+                            if (video.Video3D.O > 0)
+                            {
+                                s.A(0x20);
+                                video.Video3D.O = s.P;
+                                s.W(0L); s.W(0L); s.W(0L); s.W(0L);
+                                s.W(0L); s.W(0L); s.W(0L); s.W(0L);
+                            }
+                        }
+
+                        if (obj.Audio.O > 0)
+                        {
+                            ref AudioData audio = ref obj.Audio.V;
+                            W(ref audio.VolumeL);
+                            W(ref audio.VolumeR);
+                            W(ref audio.   PanL);
+                            W(ref audio.   PanR);
+                        }
+
+                        if (obj.Video.O > 0)
+                        {
+                            s.A(0x20);
+                            obj.Video.O = s.P;
+                            s.W(0L); s.W(0L); s.W(0L); s.W(0L);
+                            s.W(0L); s.W(0L); s.W(0L); s.W(0L); s.W(0L);
+                        }
+
+                        if (obj.Audio.O > 0)
+                        {
+                            s.A(0x20);
+                            obj.Audio.O = s.P;
+                            s.W(0L); s.W(0L); s.W(0L); s.W(0L);
+                        }
+                    }
+
+                    s.A(0x20);
+                    aet.Composition.E[j].E[0].Offset = s.P;
+                    for (int k = 0; k < aet.Composition.E[j].C; k++)
+                    {
+                        ref Layer obj = ref aet.Composition.E[j].E[k];
+                        obj.Offset = s.P;
+                        s.W(0L); s.W(0L); s.W(0L); s.W(0L); s.W(0L); s.W(0L);
+                    }
+                }
+
+                if (aet.Camera.O > 0)
+                {
+                    ref Camera camera = ref aet.Camera.V;
+                    s.A(0x10);
+                    W(ref camera.      EyeX);
+                    W(ref camera.      EyeY);
+                    W(ref camera.      EyeZ);
+                    W(ref camera. PositionX);
+                    W(ref camera. PositionY);
+                    W(ref camera. PositionZ);
+                    W(ref camera.DirectionX);
+                    W(ref camera.DirectionY);
+                    W(ref camera.DirectionZ);
+                    W(ref camera. RotationX);
+                    W(ref camera. RotationY);
+                    W(ref camera. RotationZ);
+                    W(ref camera.     Zoom );
+
+                    s.A(0x20);
+                    aet.Camera.O = s.P;
+                    s.W(0L); s.W(0L); s.W(0L); s.W(0L); s.W(0L); s.W(0L);
+                    s.W(0L); s.W(0L); s.W(0L); s.W(0L); s.W(0L); s.W(0L); s.W(0L);
+                }
+
+                s.A(0x20);
+                aetData.O = s.P;
+                s.W(0L); s.W(0L); s.W(0L); s.W(0L);
+                s.W(0L); s.W(0L); s.W(0L); s.W(0L);
+
+                s.A(0x10);
+            }
+
+            for (int i = 0; i < AET.Scenes.Length; i++)
+            {
+                ref Pointer<Scene> aetData = ref AET.Scenes[i];
+
+                ref Scene aet = ref aetData.V;
+
+                for (int j = 0; j < aet.Video.C; j++)
+                {
+                    ref Video region = ref aet.Video.E[j];
+                    for (int k = 0; k < region.Identifiers.C; k++)
+                        WPS(ref usedValues, ref region.Identifiers.E[k].Name);
+                }
+
+                //_IO.Align(0x4);
+                for (int j = 0; j < aet.Composition.C; j++)
+                {
+                    for (int k = 0; k < aet.Composition.E[j].C; k++)
+                    {
+                        ref Layer obj = ref aet.Composition.E[j].E[k];
+                        for (int l = 0; l < obj.Marker.C; l++)
+                            WPS(ref usedValues, ref obj.Marker.E[l].Name);
+                    }
+
+                    for (int k = 0; k < aet.Composition.E[j].C; k++)
+                        WPS(ref usedValues, ref aet.Composition.E[j].E[k].Name);
+                }
+
+                //_IO.Align(0x4);
+                aet.Name.O = s.P;
+                s.W(aet.Name.V + x00);
+                s.A(0x4);
+            }
+
+            s.F();
+
+            for (int i = 0; i < AET.Scenes.Length; i++)
+            {
+                ref Scene aet = ref AET.Scenes[i].V;
+
+                if (aet.Audio.C > 0)
+                {
+                    aet.Audio.O = s.P;
+                    for (int j = 0; j < aet.Audio.C; j++)
+                    {
+                        aet.Audio.E[j].O = s.P;
+                        s.W(aet.Audio[j].SoundID);
+                    }
+                }
+            }
+
+            int nullDataPos = s.P;
+            int nullDataCount = 0;
+            for (int i = 0; i < AET.Scenes.Length; i++)
+            {
+                ref Scene aet = ref AET.Scenes[i].V;
+
+                for (int j = 0; j < aet.Composition.C; j++)
+                {
+                    if (aet.Composition.E[j].C < 1) continue;
+
+                    for (int k = 0; k < aet.Composition.E[j].C; k++)
+                    {
+                        ref Layer obj = ref aet.Composition.E[j].E[k];
+
+                        if (obj.Video.O > 0)
+                        {
+                            ref VideoData video = ref obj.Video.V;
+                            if (video.Video3D.O > 0)
+                            {
+                                ref VideoData.Video3DData video3DData = ref video.Video3D.V;
+                                s.P = video.Video3D.O;
+                                W(ref s, ref video3DData.   AnchorZ);
+                                W(ref s, ref video3DData. PositionZ);
+                                W(ref s, ref video3DData.DirectionX);
+                                W(ref s, ref video3DData.DirectionY);
+                                W(ref s, ref video3DData.DirectionZ);
+                                W(ref s, ref video3DData. RotationX);
+                                W(ref s, ref video3DData. RotationY);
+                                W(ref s, ref video3DData.    ScaleZ);
+                            }
+
+                            s.P = obj.Video.O;
+                            s.W((byte)video.TransferMode.BlendMode );
+                            s.W((byte)video.TransferMode.Flags     );
+                            s.W((byte)video.TransferMode.TrackMatte);
+                            s.W((byte)0);
+
+                            W(ref s, ref video.  AnchorX);
+                            W(ref s, ref video.  AnchorY);
+                            W(ref s, ref video.PositionX);
+                            W(ref s, ref video.PositionY);
+                            W(ref s, ref video.Rotation );
+                            W(ref s, ref video.   ScaleX);
+                            W(ref s, ref video.   ScaleY);
+                            W(ref s, ref video. Opacity );
+                            s.W(video.Video3D.O);
+                        }
+
+                        if (obj.Audio.O > 0)
+                        {
+                            ref AudioData audio = ref obj.Audio.V;
+                            s.P = obj.Audio.O;
+                            W(ref s, ref audio.VolumeL);
+                            W(ref s, ref audio.VolumeR);
+                            W(ref s, ref audio.   PanL);
+                            W(ref s, ref audio.   PanR);
+                        }
+                    }
+                }
+                
+                if (aet.Camera.O > 0)
+                {
+                    ref Camera camera = ref aet.Camera.V;
+                    s.P = aet.Camera.O;
+                    W(ref s, ref camera.      EyeX);
+                    W(ref s, ref camera.      EyeY);
+                    W(ref s, ref camera.      EyeZ);
+                    W(ref s, ref camera. PositionX);
+                    W(ref s, ref camera. PositionY);
+                    W(ref s, ref camera. PositionZ);
+                    W(ref s, ref camera.DirectionX);
+                    W(ref s, ref camera.DirectionY);
+                    W(ref s, ref camera.DirectionZ);
+                    W(ref s, ref camera. RotationX);
+                    W(ref s, ref camera. RotationY);
+                    W(ref s, ref camera. RotationZ);
+                    W(ref s, ref camera.     Zoom );
+                }
+
+                void W(ref Stream _IO, ref CountPointer<KFT2> keys)
+                {
+                    if (keys.C < 1) _IO.W(0L);
+                    else {
+                        if (keys.C > 0 && keys.O == 0)
+                        { keys.O = nullDataPos + (nullDataCount << 2); nullDataCount++; }
+                        _IO.W(keys);
+                    }
+                }
+            }
+
+            s.P = nullDataPos;
+            for (int j = 0; j < nullDataCount; j++)
+                s.W(0);
+            s.A(0x10, true);
+            s.F();
+
+            for (int i = 0; i < AET.Scenes.Length; i++)
+            {
+                ref Pointer<Scene> aetData = ref AET.Scenes[i];
+
+                ref Scene aet = ref aetData.V;
+
+                for (int j = 0; j < aet.Composition.C; j++)
+                    for (int k = 0; k < aet.Composition.E[j].C; k++)
+                    {
+                        ref Layer obj = ref aet.Composition.E[j].E[k];
+                             if (obj.Type == Layer.AetLayerType.Video      ) obj.VidItmOff = aet.Video      [obj.DataID].O;
+                        else if (obj.Type == Layer.AetLayerType.Audio      ) obj.VidItmOff = aet.Audio      [obj.DataID].O;
+                        else if (obj.Type == Layer.AetLayerType.Composition) obj.VidItmOff = aet.Composition[obj.DataID].O;
+                        else obj.VidItmOff = 0;
+                    }
+
+                for (int j = 0; j < aet.Composition.C; j++)
+                    for (int k = 0; k < aet.Composition.E[j].C; k++)
+                    {
+                        ref Layer obj = ref aet.Composition.E[j].E[k];
+
+                        s.P = obj.Offset;
+                        s.W(obj.Name.O);
+                        s.W(obj.StartFrame);
+                        s.W(obj.EndFrame);
+                        s.W(obj.OffsetFrame);
+                        s.W(obj.TimeScale);
+                        s.W((ushort)obj.Flags  );
+                        s.W((  byte)obj.Quality);
+                        s.W((  byte)obj.Type   );
+                        s.W(obj.VidItmOff);
+
+                        if (obj.ParentLayer > -1)
+                        {
+                            bool Found = false;
+                            for (int l = 0; l < aet.Composition.C; l++)
+                                for (int m = 0; m < aet.Composition.E[l].C; m++)
+                                    if (aet.Composition[l].E[m].ID == obj.ParentLayer)
+                                    { Found = true; s.W(aet.Composition.E[l].E[m].Offset); break; }
+                            if (!Found) s.W(0);
+                        }
+                        else s.W(0);
+                        s.W(obj.Marker);
+                        s.W(obj.Video.O);
+                        s.W(obj.Audio.O);
+
+                        ref CountPointer<Marker> Marker = ref obj.Marker;
+                        s.P = Marker.O;
+                        for (int l = 0; l < Marker.C; l++)
+                        {
+                            s.W(Marker[l].Frame);
+                            s.W(Marker[l].Name.O);
+                        }
+                    }
+
+                for (int j = 0; j < aet.Video.C; j++)
+                {
+                    ref Video region = ref aet.Video.E[j];
+                    if (region.Identifiers.C == 0) continue;
+                    s.P = region.Identifiers.O;
+                    for (int k = 0; k < region.Identifiers.C; k++)
+                    {
+                        s.W(region.Identifiers[k].Name.O);
+                        s.W(region.Identifiers[k].ID);
+                    }
+                }
+
+                s.P = aet.Composition.O;
+                for (int j = 0; j < aet.Composition.C; j++)
+                {
+                    if (aet.Composition[j].C > 0)
+                    {
+                        s.W(aet.Composition[j].C);
+                        s.W(aet.Composition[j].E[0].Offset);
+                    }
+                    else s.W(0L);
+                }
+
+                s.P = aetData.O;
+                s.W(aet.Name.O);
+                s.W(aet.StartFrame);
+                s.W(aet.EndFrame);
+                s.W(aet.FrameRate);
+                s.W(aet.BackColor);
+                s.W(aet.Width);
+                s.W(aet.Height);
+                s.W(aet.Camera.O);
+                s.W(aet.Composition);
+                s.W(aet.Video);
+                s.W(aet.Audio);
+                s.W(0L);
             }
 
             s.P = 0;
@@ -53,454 +555,13 @@ namespace KKdMainLib
             data = null;
         }
 
-        private void AETReader(ref Pointer<Scene> aetData)
+        private void RAL(ref Composition layer, ref int id)
         {
-            s.P = aetData.O;
-            ref Scene aet = ref aetData.V;
-
-            aet.Name = s.RPS();
-            aet.StartFrame  = s.RF32();
-            aet.EndFrame    = s.RF32();
-            aet.FrameRate   = s.RF32();
-            aet.BackColor   = s.RU32();
-            aet.Width       = s.RU32();
-            aet.Height      = s.RU32();
-            aet.Camera      = s.RP<Vec2<CountPointer<KFT2>>>();
-            aet.Composition = s.RCP<Composition>();
-            aet.Video       = s.RCP<Video      >();
-            aet.Audio       = s.RCP<Audio      >();
-
-            if (aet.Camera.O > 0)
+            for (int i = 0; i < layer.C; i++, id++)
             {
-                s.P = aet.Camera.O;
-                aet.Camera.V.X.O = s.RI32();
-                aet.Camera.V.Y.O = s.RI32();
-                RKF(ref aet.Camera.V.X);
-                RKF(ref aet.Camera.V.Y);
-            }
-
-            if (aet.Audio.O > 0)
-            {
-                s.P = aet.Audio.O;
-                for (i = 0; i < aet.Audio.C; i++)
-                {
-                    ref Audio aif = ref aet.Audio.E[i];
-                    aif.O = s.P;
-                    aif.SoundID = s.RU32();
-                }
-            }
-
-            s.P = aet.Composition.O;
-            for (i = 0; i < aet.Composition.C; i++)
-                aet.Composition[i] = new Composition() { P = s.P, C = s.RI32(), O = s.RI32()};
-
-            i1 = 0;
-            RAL(ref aet.Composition.E[aet.Composition.C - 1]);
-            for (i = 0; i < aet.Composition.C - 1; i++)
-                RAL(ref aet.Composition.E[i]);
-
-            s.P = aet.Video.O;
-            for (i = 0; i < aet.Video.C; i++)
-                aet.Video[i] = new Video { O = s.P, Color = s.RU32(), Width = s.RU16(),
-                    Height = s.RU16(), Frames = s.RF32(), Identifiers = s.RCP<Video.Identifier>() };
-
-            for (i = 0; i < aet.Video.C; i++)
-            {
-                s.P = aet.Video[i].Identifiers.O;
-                for (i0 = 0; i0 < aet.Video[i].Identifiers.C; i0++)
-                    aet.Video.E[i].Identifiers[i0] = new Video.Identifier { Name = s.RPS(), ID = s.RU32() };
-            }
-
-            for (i = 0; i < aet.Composition.C; i++)
-            {
-                for (i0 = 0; i0 < aet.Composition[i].C; i0++)
-                {
-                    ref Layer obj = ref aet.Composition[i].E[i0];
-                    obj.DataID = -1;
-                    int dataOffset = obj.VidItmOff;
-                    if (dataOffset > 0)
-                             if (obj.Type == Layer.AetLayerType.Video      )
-                            for (i1 = 0; i1 < aet.Video      .C; i1++)
-                            { if (aet.Video      [i1].O == dataOffset) { obj.DataID = i1; break; } }
-                        else if (obj.Type == Layer.AetLayerType.Audio      )
-                            for (i1 = 0; i1 < aet.Audio      .C; i1++)
-                            { if (aet.Audio      [i1].O == dataOffset) { obj.DataID = i1; break; } }
-                        else if (obj.Type == Layer.AetLayerType.Composition)
-                            for (i1 = 0; i1 < aet.Composition.C; i1++)
-                            { if (aet.Composition[i1].P == dataOffset) { obj.DataID = i1; break; } }
-
-                    int parentLayer = obj.ParentLayer;
-                    if (parentLayer > 0)
-                        for (i1 = 0; i1 < aet.Composition.C; i1++)
-                        {
-                            for (i2 = 0; i2 < aet.Composition[i1].C; i2++)
-                                if (aet.Composition[i1].E[i2].Offset == parentLayer)
-                                { obj.ParentLayer = aet.Composition[i1].E[i2].ID; break; }
-                            if (parentLayer != obj.ParentLayer) break;
-                        }
-                    if (parentLayer == obj.ParentLayer) obj.ParentLayer = -1;
-                }
-            }
-        }
-
-        private void AETWriter(ref Pointer<Scene> aetData)
-        {
-            ref Scene aet = ref aetData.V;
-
-            for (i = 0; i < aet.Video.C; i++)
-            {
-                ref Video region = ref aet.Video.E[i];
-                if (region.Identifiers.C == 0) { region.Identifiers.O = 0; continue; }
-                if (region.Identifiers.C > 1) s.A(0x20);
-                region.Identifiers.O = s.P;
-                for (i0 = 0; i0 < region.Identifiers.C; i0++) s.W(0L);
-            }
-
-            s.A(0x20);
-            aet.Video.O = s.P;
-            for (i = 0; i < aet.Video.C; i++)
-            {
-                ref Video region = ref aet.Video.E[i];
-                region.O = s.P;
-                s.W(region.Color  );
-                s.W(region.Width  );
-                s.W(region.Height );
-                s.W(region.Frames );
-                s.W(region.Identifiers);
-            }
-
-            s.A(0x20);
-            aet.Composition.O = s.P;
-            for (i = 0; i < aet.Composition.C; i++)
-            {
-                aet.Composition.E[i].O = s.P;
-                s.W(0L);
-            }
-
-            for (i = 0; i < aet.Composition.C; i++)
-            {
-                if (aet.Composition.E[i].C < 1) continue;
-
-                for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
-                {
-                    ref Layer obj = ref aet.Composition.E[i].E[i0];
-                    ref VideoData video = ref obj.Video.V;
-                    ref VideoData.Video3DData video3DData = ref video.Video3D.V;
-                    ref AudioData audio = ref obj.Audio.V;
-                    if (obj.Marker.C > 0)
-                    {
-                        if (obj.Marker.C > 3) s.A(0x20);
-                        obj.Marker.O = s.P;
-                        for (i1 = 0; i1 < obj.Marker.C; i1++)
-                            s.W(0L);
-                    }
-
-                    if (obj.Video.V.Video3D.O > 0)
-                    {
-                        W(ref video3DData.   AnchorZ);
-                        W(ref video3DData. PositionZ);
-                        W(ref video3DData.DirectionX);
-                        W(ref video3DData.DirectionY);
-                        W(ref video3DData.DirectionZ);
-                        W(ref video3DData. RotationX);
-                        W(ref video3DData. RotationY);
-                        W(ref video3DData.    ScaleZ);
-                    }
-
-                    if (obj.Video.O > 0)
-                    {
-                         W(ref video.  AnchorX);
-                         W(ref video.  AnchorY);
-                         W(ref video.PositionX);
-                         W(ref video.PositionY);
-                         W(ref video.Rotation );
-                         W(ref video.   ScaleX);
-                         W(ref video.   ScaleY);
-                         W(ref video. Opacity );
-                    }
-
-                    if (obj.Video.V.Video3D.O > 0)
-                    {
-                        s.A(0x20);
-                        video.Video3D.O = s.P;
-                        s.W(0L); s.W(0L); s.W(0L); s.W(0L);
-                        s.W(0L); s.W(0L); s.W(0L); s.W(0L);
-                    }
-
-                    if (obj.Audio.O > 0)
-                    {
-                        W(ref audio.VolumeL);
-                        W(ref audio.VolumeR);
-                        W(ref audio.   PanL);
-                        W(ref audio.   PanR);
-                    }
-
-                    if (obj.Video.O > 0)
-                    {
-                        s.A(0x20);
-                        obj.Video.O = s.P;
-                        s.W(0L); s.W(0L); s.W(0L); s.W(0L);
-                        s.W(0L); s.W(0L); s.W(0L); s.W(0L); s.W(0L);
-                    }
-
-                    if (obj.Audio.O > 0)
-                    {
-                        s.A(0x20);
-                        obj.Audio.O = s.P;
-                        s.W(0L); s.W(0L); s.W(0L); s.W(0L);
-                    }
-                }
-
-                s.A(0x20);
-                aet.Composition.E[i].E[0].Offset = s.P;
-                for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
-                {
-                    ref Layer obj = ref aet.Composition.E[i].E[i0];
-                    obj.Offset = s.P;
-                    s.W(0L); s.W(0L); s.W(0L); s.W(0L); s.W(0L); s.W(0L);
-                }
-            }
-
-            if (aet.Camera.O > 0)
-            {
-                ref Vec2<CountPointer<KFT2>> pos = ref aet.Camera.V;
-                s.A(0x10);
-                W(ref pos.X);
-                W(ref pos.Y);
-
-                s.A(0x20);
-                aet.Camera.O = s.P;
-                s.W(pos.X);
-                s.W(pos.Y);
-
-                W(ref pos.X);
-                W(ref pos.Y);
-            }
-
-            s.A(0x20);
-            aetData.O = s.P;
-            s.W(0L); s.W(0L); s.W(0L); s.W(0L);
-            s.W(0L); s.W(0L); s.W(0L); s.W(0L);
-
-            s.A(0x10);
-            {
-                System.Collections.Generic.Dictionary<string, int> usedValues =
-                    new System.Collections.Generic.Dictionary<string, int>();
-
-                for (i = 0; i < aet.Video.C; i++)
-                {
-                    ref Video region = ref aet.Video.E[i];
-                    for (i0 = 0; i0 < region.Identifiers.C; i0++)
-                        WPS(ref usedValues, ref region.Identifiers.E[i0].Name);
-                }
-
-                //_IO.Align(0x4);
-                for (i = 0; i < aet.Composition.C; i++)
-                {
-                    for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
-                    {
-                        ref Layer obj = ref aet.Composition.E[i].E[i0];
-                        for (i1 = 0; i1 < obj.Marker.C; i1++)
-                            WPS(ref usedValues, ref obj.Marker.E[i1].Name);
-                    }
-
-                    for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
-                        WPS(ref usedValues, ref aet.Composition.E[i].E[i0].Name);
-                }
-
-                //_IO.Align(0x4);
-                aet.Name.O = s.P;
-                s.W(aet.Name.V + x00);
-                s.SL(s.P);
-            }
-
-            aet.Audio.O = 0;
-            if (aet.Audio.C > 0)
-            {
-                s.A(0x10);
-                aet.Audio.O = s.P;
-                for (i = 0; i < aet.Audio.C; i++)
-                {
-                    aet.Audio.E[i].O = s.P;
-                    s.W(aet.Audio[i].SoundID);
-                }
-            }
-
-            for (i = 0; i < aet.Composition.C; i++)
-                for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
-                {
-                    ref Layer obj = ref aet.Composition.E[i].E[i0];
-                         if (obj.Type == Layer.AetLayerType.Video      ) obj.VidItmOff = aet.Video      [obj.DataID].O;
-                    else if (obj.Type == Layer.AetLayerType.Audio      ) obj.VidItmOff = aet.Audio      [obj.DataID].O;
-                    else if (obj.Type == Layer.AetLayerType.Composition) obj.VidItmOff = aet.Composition[obj.DataID].O;
-                    else obj.VidItmOff = 0;
-                    if (obj.VidItmOff == 0)
-                    {
-
-                    }
-                }
-
-            s.A(0x4);
-            int returnPos = s.P;
-            int nvp = 0;
-
-            s.F();
-
-            for (i = 0; i < aet.Composition.C; i++)
-            {
-                if (aet.Composition.E[i].C < 1) continue;
-
-                for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
-                {
-                    ref Layer obj = ref aet.Composition.E[i].E[i0];
-                    ref VideoData video = ref obj.Video.V;
-                    ref VideoData.Video3DData video3DData = ref video.Video3D.V;
-                    ref AudioData audio = ref obj.Audio.V;
-
-                    if (obj.Video.V.Video3D.O > 0)
-                    {
-                        s.P = video.Video3D.O;
-                        W(ref s, ref video3DData.   AnchorZ);
-                        W(ref s, ref video3DData. PositionZ);
-                        W(ref s, ref video3DData.DirectionX);
-                        W(ref s, ref video3DData.DirectionY);
-                        W(ref s, ref video3DData.DirectionZ);
-                        W(ref s, ref video3DData. RotationX);
-                        W(ref s, ref video3DData. RotationY);
-                        W(ref s, ref video3DData.    ScaleZ);
-                    }
-
-                    if (obj.Video.O > 0)
-                    {
-                        s.P = obj.Video.O;
-                        s.W((byte)video.TransferMode.BlendMode );
-                        s.W((byte)video.TransferMode.Flags     );
-                        s.W((byte)video.TransferMode.TrackMatte);
-                        s.W((byte)0);
-
-                        W(ref s, ref video.  AnchorX);
-                        W(ref s, ref video.  AnchorY);
-                        W(ref s, ref video.PositionX);
-                        W(ref s, ref video.PositionY);
-                        W(ref s, ref video.Rotation );
-                        W(ref s, ref video.   ScaleX);
-                        W(ref s, ref video.   ScaleY);
-                        W(ref s, ref video. Opacity );
-                        s.W(video.Video3D.O);
-                    }
-
-                    if (obj.Audio.O > 0)
-                    {
-                        s.P = obj.Audio.O;
-                        W(ref s, ref audio.VolumeL);
-                        W(ref s, ref audio.VolumeR);
-                        W(ref s, ref audio.   PanL);
-                        W(ref s, ref audio.   PanR);
-                    }
-
-                    void W(ref Stream _IO, ref CountPointer<KFT2> keys)
-                    {
-                        if (keys.C < 1) _IO.W(0L);
-                        else { if (keys.C > 0 && keys.O == 0)
-                            { keys.O = returnPos + (nvp << 2); nvp++; } _IO.W(keys); }
-
-                    }
-                }
-            }
-
-            s.P = returnPos;
-            for (i = 0; i < nvp; i++)
-                s.W(0);
-            s.A(0x10, true);
-
-            s.F();
-
-            for (i = 0; i < aet.Composition.C; i++)
-                for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
-                {
-                    ref Layer obj = ref aet.Composition.E[i].E[i0];
-
-                    s.P = obj.Offset;
-                    s.W(obj.Name.O);
-                    s.W(obj.StartFrame);
-                    s.W(obj.EndFrame);
-                    s.W(obj.OffsetFrame);
-                    s.W(obj.TimeScale);
-                    s.W((ushort)obj.Flags  );
-                    s.W((  byte)obj.Quality);
-                    s.W((  byte)obj.Type   );
-                    s.W(obj.VidItmOff);
-
-                    if (obj.ParentLayer > -1)
-                    {
-                        bool Found = false;
-                        for (i1 = 0; i1 < aet.Composition.C; i1++)
-                            for (i2 = 0; i2 < aet.Composition.E[i1].C; i2++)
-                                if (aet.Composition[i1].E[i2].ID == obj.ParentLayer)
-                                { Found = true; s.W(aet.Composition.E[i1].E[i2].Offset); break; }
-                        if (!Found) s.W(0);
-                    }
-                    else s.W(0);
-                    s.W(obj.Marker);
-                    s.W(obj.Video.O);
-                    s.W(obj.Audio.O);
-
-                    ref CountPointer<Marker> Marker = ref obj.Marker;
-                    s.P = Marker.O;
-                    for (i1 = 0; i1 < Marker.C; i1++)
-                    {
-                        s.W(Marker[i1].Frame);
-                        s.W(Marker[i1].Name.O);
-                    }
-                }
-
-            s.F();
-
-            for (i = 0; i < aet.Video.C; i++)
-            {
-                ref Video region = ref aet.Video.E[i];
-                if (region.Identifiers.C == 0) continue;
-                s.P = region.Identifiers.O;
-                for (i0 = 0; i0 < region.Identifiers.C; i0++)
-                {
-                    s.W(region.Identifiers[i0].Name.O);
-                    s.W(region.Identifiers[i0].ID);
-                }
-            }
-
-            s.P = aet.Composition.O;
-            for (i = 0; i < aet.Composition.C; i++)
-            {
-                if (aet.Composition[i].C > 0)
-                {
-                    s.W(aet.Composition[i].C);
-                    s.W(aet.Composition[i].E[0].Offset);
-                }
-                else s.W(0L);
-            }
-
-            s.P = aetData.O;
-            s.W(aet.Name.O);
-            s.W(aet.StartFrame);
-            s.W(aet.EndFrame);
-            s.W(aet.FrameRate);
-            s.W(aet.BackColor);
-            s.W(aet.Width);
-            s.W(aet.Height);
-            s.W(aet.Camera.O);
-            s.W(aet.Composition);
-            s.W(aet.Video);
-            s.W(aet.Audio);
-            s.W(0L);
-        }
-
-        private void RAL(ref Composition layer)
-        {
-            for (i0 = 0; i0 < layer.C; i0++, i1++)
-            {
-                layer.E[i0].ID = i1;
-                ref Layer obj = ref layer.E[i0];
-                s.P = obj.Offset = layer.O + i0 * 0x30;
+                layer.E[i].ID = id;
+                ref Layer obj = ref layer.E[i];
+                s.P = obj.Offset = layer.O + i * 0x30;
                 obj.Name = s.RPS();
                 obj.StartFrame    = s.RF32();
                 obj.  EndFrame    = s.RF32();
@@ -582,8 +643,8 @@ namespace KKdMainLib
                 }
 
                 s.P = obj.Marker.O;
-                for (i2 = 0; i2 < obj.Marker.C; i2++)
-                    obj.Marker[i2] = new Marker() { Frame = s.RF32(), Name = s.RPSSJIS() };
+                for (int j = 0; j < obj.Marker.C; j++)
+                    obj.Marker[j] = new Marker() { Frame = s.RF32(), Name = s.RPSSJIS() };
             }
         }
 
@@ -652,7 +713,6 @@ namespace KKdMainLib
 
         public void MsgPackReader(MsgPack msgPack, ref Pointer<Scene> aetData)
         {
-            int i, i0;
             aetData = default;
             ref Scene aet = ref aetData.V;
 
@@ -668,21 +728,34 @@ namespace KKdMainLib
             if ((temp = msgPack["Camera"]).NotNull)
             {
                 aet.Camera.O = 1;
-                aet.Camera.V.X = RKF(temp, "X");
-                aet.Camera.V.Y = RKF(temp, "Y");
+
+                ref Camera camera = ref aet.Camera.V;
+                camera.      EyeX = RKF(temp,       "EyeX");
+                camera.      EyeY = RKF(temp,       "EyeY");
+                camera.      EyeZ = RKF(temp,       "EyeZ");
+                camera. PositionX = RKF(temp,  "PositionX");
+                camera. PositionY = RKF(temp,  "PositionY");
+                camera. PositionZ = RKF(temp,  "PositionZ");
+                camera.DirectionX = RKF(temp, "DirectionX");
+                camera.DirectionY = RKF(temp, "DirectionY");
+                camera.DirectionZ = RKF(temp, "DirectionZ");
+                camera. RotationX = RKF(temp,  "RotationX");
+                camera. RotationY = RKF(temp,  "RotationY");
+                camera. RotationZ = RKF(temp,  "RotationZ");
+                camera.     Zoom  = RKF(temp,      "Zoom" );
             }
 
             if ((temp = msgPack["Audio", true]).NotNull)
             {
                 aet.Audio.C = temp.Array.Length;
-                for (i = 0; i < aet.Audio.C; i++)
+                for (int i = 0; i < aet.Audio.C; i++)
                     aet.Audio.E[i] = new Audio { SoundID = temp[i].RU32("SoundID") };
             }
 
             if ((temp = msgPack["Video", true]).NotNull)
             {
                 aet.Video.C = temp.Array.Length;
-                for (i = 0; i < aet.Video.C; i++)
+                for (int i = 0; i < aet.Video.C; i++)
                 {
                     ref Video region = ref aet.Video.E[i];
                     region = default;
@@ -695,9 +768,9 @@ namespace KKdMainLib
                     if (identifiers.NotNull)
                     {
                         region.Identifiers.C = identifiers.Array.Length;
-                        for (i0 = 0; i0 < region.Identifiers.C; i0++)
-                            region.Identifiers[i0] = new Video.Identifier() { Name = new Pointer<string>()
-                            { V = identifiers[i0].RS("Name") }, ID = identifiers[i0].RU32("ID") };
+                        for (int j = 0; j < region.Identifiers.C; j++)
+                            region.Identifiers[j] = new Video.Identifier() { Name = new Pointer<string>()
+                            { V = identifiers[j].RS("Name") }, ID = identifiers[j].RU32("ID") };
                     }
                 }
             }
@@ -705,7 +778,7 @@ namespace KKdMainLib
             if ((temp = msgPack["Composition", true]).NotNull)
             {
                 aet.Composition.C = temp.Array.Length + 1;
-                for (i = 0; i < aet.Composition.C - 1; i++)
+                for (int i = 0; i < aet.Composition.C - 1; i++)
                 {
                     ref Composition l = ref aet.Composition.E[i];
                     l = default;
@@ -713,8 +786,8 @@ namespace KKdMainLib
                     if (layer.NotNull)
                     {
                         l.C = layer.Array.Length;
-                        for (i0 = 0; i0 < l.C; i0++)
-                            RL(ref l.E[i0], layer[i0]);
+                        for (int j = 0; j < l.C; j++)
+                            RL(ref l.E[j], layer[j]);
                     }
                 }
             }
@@ -722,10 +795,10 @@ namespace KKdMainLib
 
             if ((temp = msgPack["Root", true]).NotNull)
             {
-                i = aet.Composition.C - 1;
-                aet.Composition.E[i].C = temp.Array.Length;
-                for (i0 = 0; i0 < aet.Composition[i].C; i0++)
-                    RL(ref aet.Composition.E[i].E[i0], temp[i0]);
+                ref Composition rootComp = ref aet.Composition.E[aet.Composition.C - 1];
+                rootComp.C = temp.Array.Length;
+                for (int j = 0; j < rootComp.C; j++)
+                    RL(ref rootComp.E[j], temp[j]);
             }
             temp.Dispose();
         }
@@ -734,7 +807,6 @@ namespace KKdMainLib
         {
             if (aetData.O <= 0) return default;
 
-            int i, i0;
             ref Scene aet = ref aetData.V;
 
             MsgPack msgPack = MsgPack.New.Add("Name", aet.Name.V).Add("StartFrame", aet.StartFrame)
@@ -743,28 +815,44 @@ namespace KKdMainLib
 
 
             if (aet.Camera.O > 0)
-                msgPack.Add(new MsgPack("Camera").Add(WMP(ref aet.Camera.V.X, "X"))
-                                               .Add(WMP(ref aet.Camera.V.Y, "Y")));
+            {
+                ref Camera camera = ref aet.Camera.V;
+                MsgPack cameraData = new MsgPack("Camera");
+
+                cameraData.Add(WMP(ref camera.      EyeX,       "EyeX"));
+                cameraData.Add(WMP(ref camera.      EyeY,       "EyeY"));
+                cameraData.Add(WMP(ref camera.      EyeZ,       "EyeZ"));
+                cameraData.Add(WMP(ref camera. PositionX,  "PositionX"));
+                cameraData.Add(WMP(ref camera. PositionY,  "PositionY"));
+                cameraData.Add(WMP(ref camera. PositionZ,  "PositionZ"));
+                cameraData.Add(WMP(ref camera.DirectionX, "DirectionX"));
+                cameraData.Add(WMP(ref camera.DirectionY, "DirectionY"));
+                cameraData.Add(WMP(ref camera.DirectionZ, "DirectionZ"));
+                cameraData.Add(WMP(ref camera. RotationX,  "RotationX"));
+                cameraData.Add(WMP(ref camera. RotationY,  "RotationY"));
+                cameraData.Add(WMP(ref camera. RotationZ,  "RotationZ"));
+                cameraData.Add(WMP(ref camera.     Zoom ,      "Zoom" ));
+            }
 
 
-            i = aet.Composition.C - 1;
-            MsgPack rootLayer = new MsgPack(aet.Composition[i].C, "Root");
-            for (i0 = 0; i0 < aet.Composition[i].C; i0++)
-                rootLayer[i0] = WL(ref aet.Composition[i].E[i0]);
+            ref Composition rootComp = ref aet.Composition.E[aet.Composition.C - 1];
+            MsgPack rootLayer = new MsgPack(rootComp.C, "Root");
+            for (int j = 0; j < rootComp.C; j++)
+                rootLayer[j] = WL(ref rootComp.E[j]);
             msgPack.Add(rootLayer);
 
             if (aet.Composition.C > 1)
             {
                 MsgPack compositions = new MsgPack(aet.Composition.C - 1, "Composition");
-                for (i = 0; i < aet.Composition.C - 1; i++)
+                for (int i = 0; i < aet.Composition.C - 1; i++)
                 {
                     ref Composition composition = ref aet.Composition.E[i];
                     MsgPack compos = MsgPack.New.Add("ID", i);
                     if (composition.C > 0)
                     {
                         MsgPack objects = new MsgPack(composition.C, "Layer");
-                        for (i0 = 0; i0 < composition.C; i0++)
-                            objects[i0] = WL(ref composition.E[i0]);
+                        for (int j = 0; j < composition.C; j++)
+                            objects[j] = WL(ref composition.E[j]);
                         compos.Add(objects);
                     }
                     compositions[i] = compos;
@@ -773,7 +861,7 @@ namespace KKdMainLib
             }
 
             MsgPack video = new MsgPack(aet.Video.C, "Video");
-            for (i = 0; i < aet.Video.C; i++)
+            for (int i = 0; i < aet.Video.C; i++)
             {
                 ref Video v = ref aet.Video.E[i];
                 MsgPack entry = MsgPack.New.Add("ID", i).Add("Width", v.Width)
@@ -783,9 +871,9 @@ namespace KKdMainLib
                 {
                     entry.Add("Frames", v.Frames);
                     MsgPack identifiers = new MsgPack(v.Identifiers.C, "Identifiers");
-                    for (i0 = 0; i0 < v.Identifiers.C; i0++)
-                        identifiers[i0] = MsgPack.New.Add("Name", v.Identifiers[i0].Name.V)
-                                                     .Add("ID"  , v.Identifiers[i0].ID);
+                    for (int j = 0; j < v.Identifiers.C; j++)
+                        identifiers[j] = MsgPack.New.Add("Name", v.Identifiers[j].Name.V)
+                                                     .Add("ID"  , v.Identifiers[j].ID);
                     entry.Add(identifiers);
                 }
                 video[i] = entry;
@@ -793,7 +881,7 @@ namespace KKdMainLib
             msgPack.Add(video);
 
             MsgPack audio = new MsgPack(aet.Audio.C, "Audio");
-            for (i = 0; i < aet.Audio.C; i++)
+            for (int i = 0; i < aet.Audio.C; i++)
                 audio[i] = MsgPack.New.Add("ID", i).Add("SoundID", aet.Audio[i].SoundID);
             msgPack.Add(audio);
 
@@ -802,7 +890,6 @@ namespace KKdMainLib
 
         private Layer RL(ref Layer layer, MsgPack msg)
         {
-            uint i;
             layer = default;
             layer.ID     = msg.RI32("ID"  );
             layer.Name.V = msg.RS  ("Name");
@@ -820,7 +907,7 @@ namespace KKdMainLib
             if ((temp = msg["Marker", true]).NotNull)
             {
                 layer.Marker.C = temp.Array.Length;
-                for (i = 0; i < layer.Marker.C; i++)
+                for (int i = 0; i < layer.Marker.C; i++)
                 {
                     layer.Marker.E[i].Frame   = temp[i].RF32("Frame");
                     layer.Marker.E[i]. Name.V = temp[i].RS  ( "Name");
diff --git a/KKdMainLib/FARC.cs b/KKdMainLib/FARC.cs
index 604ac64..8d6524c 100644
--- a/KKdMainLib/FARC.cs
+++ b/KKdMainLib/FARC.cs
@@ -140,7 +140,7 @@ namespace KKdMainLib
 
                     if (file.Size != 0)
                     {
-                        file.Compressed = (FARCFlags & Flags.GZip) != 0;
+                        file.Compressed = true;
                     }
                     else
                     {
@@ -172,7 +172,7 @@ namespace KKdMainLib
                         file.Compressed = false;
                     }
 
-                    file.Encrypted = false;
+                    file.Encrypted = (FARCFlags & Flags.AES) != 0;
                     Files.Add(file);
                 }
             else
diff --git a/KKdMainLib/IO/MP.cs b/KKdMainLib/IO/MP.cs
index b7d6297..24e3c5e 100644
--- a/KKdMainLib/IO/MP.cs
+++ b/KKdMainLib/IO/MP.cs
@@ -1,342 +1,342 @@
-using KKdBaseLib;
-
-namespace KKdMainLib.IO
-{
-    public struct MP : System.IDisposable
-    {
-        public MP(Stream _IO) => this._IO = _IO;
-
-        private Stream _IO;
-
-        public void Close() => _IO.C();
-
-        public byte[] ToArray(bool Close = false) => _IO.ToArray(Close);
-
-        public MsgPack Read(bool array = false)
-        {
-            MsgPack msgPack = MsgPack.New;
-            byte unk = _IO.RU8();
-            if (!array) { msgPack.Name = RS((Types)unk); unk = _IO.RU8(); }
-            Types type = (Types)unk;
-
-            if (type >= Types.FixMap && type <= Types.FixMapMax)
-            {
-                msgPack.Object = KKdList<MsgPack>.New;
-                for (int i = 0; i < unk - (byte)Types.FixMap; i++) msgPack.Add( Read(false));
-            }
-            else if (type >= Types.FixArr && type <= Types.FixArrMax)
-            {
-                msgPack.Object = new MsgPack[unk - (byte)Types.FixArr];
-                for (int i = 0; i < unk - (byte)Types.FixArr; i++) msgPack[i] = Read( true);
-            }
-            else if (type >= Types.FixStr && type <= Types.FixStrMax) msgPack.Object = RS(type);
-            else if (type >= Types.PosInt && type <= Types.PosIntMax) msgPack.Object =        unk;
-            else if (type >= Types.NegInt && type <= Types.NegIntMax) msgPack.Object = (sbyte)unk;
-            else
-                while (true)
-                {
-                    if (RN (ref msgPack, ref type)) break;
-                    if (RBy(ref msgPack, ref type)) break;
-                    if (RM (ref msgPack, ref type)) break;
-                    if (RE (ref msgPack, ref type)) break;
-                    if (RS (ref msgPack, ref type)) break;
-                    if (RBo(ref msgPack, ref type)) break;
-                    if (RA (ref msgPack, ref type)) break;
-                    if (RI (ref msgPack, ref type)) break;
-                    if (RU (ref msgPack, ref type)) break;
-                    if (RF (ref msgPack, ref type)) break;
-                    break;
-                }
-            return msgPack;
-        }
-
-        private bool RI(ref MsgPack msgPack, ref Types type)
-        {
-                 if (type == Types.Int8 ) msgPack.Object = _IO.RI8();
-            else if (type == Types.Int16) msgPack.Object = _IO.RI16E(true);
-            else if (type == Types.Int32) msgPack.Object = _IO.RI32E(true);
-            else if (type == Types.Int64) msgPack.Object = _IO.RI64E(true);
-            else return false;
-            return true;
-        }
-
-        private bool RU(ref MsgPack msgPack, ref Types type)
-        {
-                 if (type == Types.UInt8 ) msgPack.Object = _IO.RU8();
-            else if (type == Types.UInt16) msgPack.Object = _IO.RU16E(true);
-            else if (type == Types.UInt32) msgPack.Object = _IO.RU32E(true);
-            else if (type == Types.UInt64) msgPack.Object = _IO.RU64E(true);
-            else return false;
-            return true;
-        }
-
-        private bool RF(ref MsgPack msgPack, ref Types type)
-        {
-                 if (type == Types.Float32) msgPack.Object = _IO.RF32E(true);
-            else if (type == Types.Float64) msgPack.Object = _IO.RF64E(true);
-            else return false;
-            return true;
-        }
-
-        private bool RBo(ref MsgPack msgPack, ref Types type)
-        {
-                 if (type == Types.False) msgPack.Object = false;
-            else if (type == Types.True ) msgPack.Object = true ;
-            else return false;
-            return true;
-        }
-
-        private bool RBy(ref MsgPack msgPack, ref Types type)
-        {
-            int Length = 0;
-                 if (type == Types.Bin8 ) Length = _IO.RU8();
-            else if (type == Types.Bin16) Length = _IO.RI16E(true);
-            else if (type == Types.Bin32) Length = _IO.RI32E(true);
-            else return false;
-            msgPack.Object = _IO.RBy(Length);
-            return true;
-        }
-
-        private bool RS(ref MsgPack msgPack, ref Types type)
-        {
-            string val = RS(type);
-            if (val != null) msgPack.Object = val;
-            else return false;
-            return true;
-        }
-
-        private string RS(Types val)
-        {
-                 if (val >= Types.FixStr  && val <= Types.FixStrMax)
-                return _IO.RS(val - Types.FixStr);
-            else if (val >= Types.   Str8 && val <= Types.   Str32 )
-            {
-                System.Enum.TryParse(val.ToString(), out Types type);
-                int Length = 0;
-                     if (type == Types.Str8 ) Length = _IO.RU8();
-                else if (type == Types.Str16) Length = _IO.RI16E(true);
-                else                          Length = _IO.RI32E(true);
-                return _IO.RS(Length);
-            }
-            return null;
-        }
-
-        private bool RN(ref MsgPack msgPack, ref Types type)
-        {
-            if (type == Types.Nil) msgPack.Object = null;
-            else return false;
-            return true;
-        }
-
-        private bool RA(ref MsgPack msgPack, ref Types type)
-        {
-            int Length = 0;
-                 if (type == Types.Arr16) Length = _IO.RI16E(true);
-            else if (type == Types.Arr32) Length = _IO.RI32E(true);
-            else return false;
-            msgPack.Object = new MsgPack[Length];
-            for (int i = 0; i < Length; i++) msgPack[i] = Read(true);
-            return true;
-        }
-
-        private bool RM(ref MsgPack msgPack, ref Types type)
-        {
-            int Length = 0;
-                 if (type == Types.Map16) Length = _IO.RI16E(true);
-            else if (type == Types.Map32) Length = _IO.RI32E(true);
-            else return false;
-            msgPack.Object = KKdList<MsgPack>.New;
-            for (int i = 0; i < Length; i++) msgPack.Add(Read());
-            return true;
-        }
-
-        private bool RE(ref MsgPack MsgPack, ref Types type)
-        {
-            int Length = 0;
-                 if (type == Types.FixExt1 ) Length = 1 ;
-            else if (type == Types.FixExt2 ) Length = 2 ;
-            else if (type == Types.FixExt4 ) Length = 4 ;
-            else if (type == Types.FixExt8 ) Length = 8 ;
-            else if (type == Types.FixExt16) Length = 16;
-            else if (type == Types.   Ext8 ) Length = _IO.RU8();
-            else if (type == Types.   Ext16) Length = _IO.RI16E(true);
-            else if (type == Types.   Ext32) Length = _IO.RI32E(true);
-            else return false;
-            MsgPack.Object = new MsgPack.Ext { Type = _IO.RI8(), Data = _IO.RBy(Length) };
-            return true;
-        }
-
-        public MP W(MsgPack msgPack, bool ignoreNull, bool IsArray = false)
-        {
-            if   (msgPack.Name != null && !IsArray) W(msgPack.Name);
-            Write(msgPack.Object, ignoreNull);
-            return this;
-        }
-
-        private void Write(object obj, bool ignoreNull)
-        {
-            if (obj == null) { if (!ignoreNull) WN(); return; }
-            switch (obj)
-            {
-                case KKdList<MsgPack>  val: WM(val.Count );
-                    for (int i = 0; i < val.Count ; i++) W(val[i], ignoreNull); break;
-                case         MsgPack[] val: WA(val.Length);
-                    for (int i = 0; i < val.Length; i++) W(val[i], ignoreNull); break;
-                case     MsgPack val: W(val, ignoreNull); break;
-                case      byte[] val: W(val); break;
-                case        bool val: W(val); break;
-                case       sbyte val: W(val); break;
-                case        byte val: W(val); break;
-                case       short val: W(val); break;
-                case      ushort val: W(val); break;
-                case         int val: W(val); break;
-                case        uint val: W(val); break;
-                case        long val: W(val); break;
-                case       ulong val: W(val); break;
-                case       float val: W(val); break;
-                case      double val: W(val); break;
-                case      string val: W(val); break;
-                case MsgPack.Ext val: W(val); break;
-            }
-        }
-
-        private void W( sbyte val) { if (val < -0x20) _IO.W((byte)0xD0); _IO.W(val); }
-        private void W(  byte val) { if (val >= 0x80) _IO.W((byte)0xCC); _IO.W(val); }
-        private void W( short val) { if (( sbyte)val == val) W(( sbyte)val);
-                                else if ((  byte)val == val) W((  byte)val);
-                                else { _IO.W((byte)0xD1); _IO.WE(val, true); } }
-        private void W(ushort val) { if ((  byte)val == val) W((  byte)val);
-                                else { _IO.W((byte)0xCD); _IO.WE(val, true); } }
-        private void W(   int val) { if (( short)val == val) W(( short)val);
-                                else if ((ushort)val == val) W((ushort)val);
-                                else { _IO.W((byte)0xD2); _IO.WE(val, true); } }
-        private void W(  uint val) { if ((ushort)val == val) W((ushort)val);
-                                else { _IO.W((byte)0xCE); _IO.WE(val, true); } }
-        private void W(  long val) { if ((   int)val == val) W((   int)val);
-                                else if ((  uint)val == val) W((  uint)val);
-                                else { _IO.W((byte)0xD3); _IO.WE(val, true); } }
-        private void W( ulong val) { if ((  uint)val == val) W((  uint)val);
-                                else { _IO.W((byte)0xCF); _IO.WE(val, true); } }
-        private void W( float val) { if ((  long)val == val) W((  long)val);
-                                else { _IO.W((byte)0xCA); _IO.WE(val, true); } }
-        private void W(double val) { if ((  long)val == val) W((  long)val);
-                                else if (( float)val == val) W(( float)val);
-                                else { _IO.W((byte)0xCB); _IO.WE(val, true); } }
-
-        private void W(  bool val) =>
-            _IO.W((byte)(val ? 0xC3 : 0xC2));
-
-        private void W(byte[] val)
-        {
-            if (val == null) { WN(); return; }
-
-                 if (val.Length <   0x100) { _IO.W((byte)0xC4); _IO.W ((  byte)val.Length      ); }
-            else if (val.Length < 0x10000) { _IO.W((byte)0xC5); _IO.WE((ushort)val.Length, true); }
-            else                           { _IO.W((byte)0xC6); _IO.WE(        val.Length, true); }
-            _IO.W(val);
-        }
-
-        private void W(string val)
-        {
-            if (val == null) { WN(); return; }
-
-            byte[] array = Text.ToUTF8(val);
-                 if (array.Length <    0x20)   _IO.W((byte)(0xA0 | (array.Length & 0x1F)));
-            else if (array.Length <   0x100) { _IO.W((byte)0xD9); _IO.W ((  byte)array.Length); }
-            else if (array.Length < 0x10000) { _IO.W((byte)0xDA); _IO.WE((ushort)array.Length, true); }
-            else                             { _IO.W((byte)0xDB); _IO.WE(        array.Length, true); }
-            _IO.W(array);
-        }
-
-        private void WN() => _IO.W((byte)0xC0);
-
-        private void WA(int val)
-        {
-                 if (val ==      0) { WN(); return; }
-            else if (val <    0x10)   _IO.W((byte)(0x90 | (val & 0x0F)));
-            else if (val < 0x10000) { _IO.W((byte)0xDC); _IO.WE((ushort)val, true); }
-            else                    { _IO.W((byte)0xDD); _IO.WE(        val, true); }
-        }
-
-        private void WM(int val)
-        {
-                 if (val ==      0) { WN(); return; }
-            else if (val <    0x10)   _IO.W((byte)(0x80 | (val & 0x0F)));
-            else if (val < 0x10000) { _IO.W((byte)0xDE); _IO.WE((ushort)val, true); }
-            else                    { _IO.W((byte)0xDF); _IO.WE(        val, true); }
-        }
-
-        private void W(MsgPack.Ext val) => WE(val);
-
-        private void WE(MsgPack.Ext val)
-        {
-            if (val.Data == null) { WN(); return; }
-
-                 if (val.Data.Length <  1 ) { WN(); return; }
-            else if (val.Data.Length == 1 ) _IO.W((byte)0xD4);
-            else if (val.Data.Length == 2 ) _IO.W((byte)0xD5);
-            else if (val.Data.Length == 4 ) _IO.W((byte)0xD6);
-            else if (val.Data.Length == 8 ) _IO.W((byte)0xD7);
-            else if (val.Data.Length == 16) _IO.W((byte)0xD8);
-            else
-            {
-                     if (val.Data.Length <   0x100)
-                { _IO.W((byte)0xC7); _IO.W ((  byte)val.Data.Length); }
-                else if (val.Data.Length < 0x10000)
-                { _IO.W((byte)0xC8); _IO.WE((ushort)val.Data.Length, true); }
-                else
-                { _IO.W((byte)0xC9); _IO.WE(        val.Data.Length, true); }
-            }
-            _IO.W(val.Type);
-            _IO.W(val.Data);
-        }
-
-        public void Dispose() => _IO.C();
-    }
-
-    public enum Types : byte
-    {
-        PosInt    = 0b00000000,
-        FixMap    = 0b10000000,
-        FixArr    = 0b10010000,
-        FixStr    = 0b10100000,
-        Nil       = 0b11000000,
-        NeverUsed = 0b11000001,
-        False     = 0b11000010,
-        True      = 0b11000011,
-        Bin8      = 0b11000100,
-        Bin16     = 0b11000101,
-        Bin32     = 0b11000110,
-        Ext8      = 0b11000111,
-        Ext16     = 0b11001000,
-        Ext32     = 0b11001001,
-        Float32   = 0b11001010,
-        Float64   = 0b11001011,
-        UInt8     = 0b11001100,
-        UInt16    = 0b11001101,
-        UInt32    = 0b11001110,
-        UInt64    = 0b11001111,
-        Int8      = 0b11010000,
-        Int16     = 0b11010001,
-        Int32     = 0b11010010,
-        Int64     = 0b11010011,
-        FixExt1   = 0b11010100,
-        FixExt2   = 0b11010101,
-        FixExt4   = 0b11010110,
-        FixExt8   = 0b11010111,
-        FixExt16  = 0b11011000,
-        Str8      = 0b11011001,
-        Str16     = 0b11011010,
-        Str32     = 0b11011011,
-        Arr16     = 0b11011100,
-        Arr32     = 0b11011101,
-        Map16     = 0b11011110,
-        Map32     = 0b11011111,
-        NegInt    = 0b11100000,
-        PosIntMax = 0b01111111,
-        FixMapMax = 0b10001111,
-        FixArrMax = 0b10011111,
-        FixStrMax = 0b10111111,
-        NegIntMax = 0b11111111,
-    }
-}
+using KKdBaseLib;
+
+namespace KKdMainLib.IO
+{
+    public struct MP : System.IDisposable
+    {
+        public MP(Stream _IO) => this._IO = _IO;
+
+        private Stream _IO;
+
+        public void Close() => _IO.C();
+
+        public byte[] ToArray(bool Close = false) => _IO.ToArray(Close);
+
+        public MsgPack Read(bool array = false)
+        {
+            MsgPack msgPack = MsgPack.New;
+            byte unk = _IO.RU8();
+            if (!array) { msgPack.Name = RS((Types)unk); unk = _IO.RU8(); }
+            Types type = (Types)unk;
+
+            if (type >= Types.FixMap && type <= Types.FixMapMax)
+            {
+                msgPack.Object = KKdList<MsgPack>.New;
+                for (int i = 0; i < unk - (byte)Types.FixMap; i++) msgPack.Add( Read(false));
+            }
+            else if (type >= Types.FixArr && type <= Types.FixArrMax)
+            {
+                msgPack.Object = new MsgPack[unk - (byte)Types.FixArr];
+                for (int i = 0; i < unk - (byte)Types.FixArr; i++) msgPack[i] = Read( true);
+            }
+            else if (type >= Types.FixStr && type <= Types.FixStrMax) msgPack.Object = RS(type);
+            else if (type >= Types.PosInt && type <= Types.PosIntMax) msgPack.Object =        unk;
+            else if (type >= Types.NegInt && type <= Types.NegIntMax) msgPack.Object = (sbyte)unk;
+            else
+                while (true)
+                {
+                    if (RN (ref msgPack, ref type)) break;
+                    if (RBy(ref msgPack, ref type)) break;
+                    if (RM (ref msgPack, ref type)) break;
+                    if (RE (ref msgPack, ref type)) break;
+                    if (RS (ref msgPack, ref type)) break;
+                    if (RBo(ref msgPack, ref type)) break;
+                    if (RA (ref msgPack, ref type)) break;
+                    if (RI (ref msgPack, ref type)) break;
+                    if (RU (ref msgPack, ref type)) break;
+                    if (RF (ref msgPack, ref type)) break;
+                    break;
+                }
+            return msgPack;
+        }
+
+        private bool RI(ref MsgPack msgPack, ref Types type)
+        {
+                 if (type == Types.Int8 ) msgPack.Object = _IO.RI8();
+            else if (type == Types.Int16) msgPack.Object = _IO.RI16E(true);
+            else if (type == Types.Int32) msgPack.Object = _IO.RI32E(true);
+            else if (type == Types.Int64) msgPack.Object = _IO.RI64E(true);
+            else return false;
+            return true;
+        }
+
+        private bool RU(ref MsgPack msgPack, ref Types type)
+        {
+                 if (type == Types.UInt8 ) msgPack.Object = _IO.RU8();
+            else if (type == Types.UInt16) msgPack.Object = _IO.RU16E(true);
+            else if (type == Types.UInt32) msgPack.Object = _IO.RU32E(true);
+            else if (type == Types.UInt64) msgPack.Object = _IO.RU64E(true);
+            else return false;
+            return true;
+        }
+
+        private bool RF(ref MsgPack msgPack, ref Types type)
+        {
+                 if (type == Types.Float32) msgPack.Object = _IO.RF32E(true);
+            else if (type == Types.Float64) msgPack.Object = _IO.RF64E(true);
+            else return false;
+            return true;
+        }
+
+        private bool RBo(ref MsgPack msgPack, ref Types type)
+        {
+                 if (type == Types.False) msgPack.Object = false;
+            else if (type == Types.True ) msgPack.Object = true ;
+            else return false;
+            return true;
+        }
+
+        private bool RBy(ref MsgPack msgPack, ref Types type)
+        {
+            int Length = 0;
+                 if (type == Types.Bin8 ) Length = _IO.RU8();
+            else if (type == Types.Bin16) Length = _IO.RI16E(true);
+            else if (type == Types.Bin32) Length = _IO.RI32E(true);
+            else return false;
+            msgPack.Object = _IO.RBy(Length);
+            return true;
+        }
+
+        private bool RS(ref MsgPack msgPack, ref Types type)
+        {
+            string val = RS(type);
+            if (val != null) msgPack.Object = val;
+            else return false;
+            return true;
+        }
+
+        private string RS(Types val)
+        {
+                 if (val >= Types.FixStr  && val <= Types.FixStrMax)
+                return _IO.RS(val - Types.FixStr);
+            else if (val >= Types.   Str8 && val <= Types.   Str32 )
+            {
+                System.Enum.TryParse(val.ToString(), out Types type);
+                int Length = 0;
+                     if (type == Types.Str8 ) Length = _IO.RU8();
+                else if (type == Types.Str16) Length = _IO.RI16E(true);
+                else                          Length = _IO.RI32E(true);
+                return _IO.RS(Length);
+            }
+            return null;
+        }
+
+        private bool RN(ref MsgPack msgPack, ref Types type)
+        {
+            if (type == Types.Nil) msgPack.Object = null;
+            else return false;
+            return true;
+        }
+
+        private bool RA(ref MsgPack msgPack, ref Types type)
+        {
+            int Length = 0;
+                 if (type == Types.Arr16) Length = _IO.RI16E(true);
+            else if (type == Types.Arr32) Length = _IO.RI32E(true);
+            else return false;
+            msgPack.Object = new MsgPack[Length];
+            for (int i = 0; i < Length; i++) msgPack[i] = Read(true);
+            return true;
+        }
+
+        private bool RM(ref MsgPack msgPack, ref Types type)
+        {
+            int Length = 0;
+                 if (type == Types.Map16) Length = _IO.RI16E(true);
+            else if (type == Types.Map32) Length = _IO.RI32E(true);
+            else return false;
+            msgPack.Object = KKdList<MsgPack>.New;
+            for (int i = 0; i < Length; i++) msgPack.Add(Read());
+            return true;
+        }
+
+        private bool RE(ref MsgPack MsgPack, ref Types type)
+        {
+            int Length = 0;
+                 if (type == Types.FixExt1 ) Length = 1 ;
+            else if (type == Types.FixExt2 ) Length = 2 ;
+            else if (type == Types.FixExt4 ) Length = 4 ;
+            else if (type == Types.FixExt8 ) Length = 8 ;
+            else if (type == Types.FixExt16) Length = 16;
+            else if (type == Types.   Ext8 ) Length = _IO.RU8();
+            else if (type == Types.   Ext16) Length = _IO.RI16E(true);
+            else if (type == Types.   Ext32) Length = _IO.RI32E(true);
+            else return false;
+            MsgPack.Object = new MsgPack.Ext { Type = _IO.RI8(), Data = _IO.RBy(Length) };
+            return true;
+        }
+
+        public MP W(MsgPack msgPack, bool ignoreNull, bool IsArray = false)
+        {
+            if   (msgPack.Name != null && !IsArray) W(msgPack.Name);
+            Write(msgPack.Object, ignoreNull);
+            return this;
+        }
+
+        private void Write(object obj, bool ignoreNull)
+        {
+            if (obj == null) { if (!ignoreNull) WN(); return; }
+            switch (obj)
+            {
+                case KKdList<MsgPack>  val: WM(val.Count );
+                    for (int i = 0; i < val.Count ; i++) W(val[i], ignoreNull); break;
+                case         MsgPack[] val: WA(val.Length);
+                    for (int i = 0; i < val.Length; i++) W(val[i], ignoreNull); break;
+                case     MsgPack val: W(val, ignoreNull); break;
+                case      byte[] val: W(val); break;
+                case        bool val: W(val); break;
+                case       sbyte val: W(val); break;
+                case        byte val: W(val); break;
+                case       short val: W(val); break;
+                case      ushort val: W(val); break;
+                case         int val: W(val); break;
+                case        uint val: W(val); break;
+                case        long val: W(val); break;
+                case       ulong val: W(val); break;
+                case       float val: W(val); break;
+                case      double val: W(val); break;
+                case      string val: W(val); break;
+                case MsgPack.Ext val: W(val); break;
+            }
+        }
+
+        private void W( sbyte val) { if (val < -0x20) _IO.W((byte)0xD0); _IO.W(val); }
+        private void W(  byte val) { if (val >= 0x80) _IO.W((byte)0xCC); _IO.W(val); }
+        private void W( short val) { if (( sbyte)val == val) W(( sbyte)val);
+                                else if ((  byte)val == val) W((  byte)val);
+                                else { _IO.W((byte)0xD1); _IO.WE(val, true); } }
+        private void W(ushort val) { if ((  byte)val == val) W((  byte)val);
+                                else { _IO.W((byte)0xCD); _IO.WE(val, true); } }
+        private void W(   int val) { if (( short)val == val) W(( short)val);
+                                else if ((ushort)val == val) W((ushort)val);
+                                else { _IO.W((byte)0xD2); _IO.WE(val, true); } }
+        private void W(  uint val) { if ((ushort)val == val) W((ushort)val);
+                                else { _IO.W((byte)0xCE); _IO.WE(val, true); } }
+        private void W(  long val) { if ((   int)val == val) W((   int)val);
+                                else if ((  uint)val == val) W((  uint)val);
+                                else { _IO.W((byte)0xD3); _IO.WE(val, true); } }
+        private void W( ulong val) { if ((  uint)val == val) W((  uint)val);
+                                else { _IO.W((byte)0xCF); _IO.WE(val, true); } }
+        private void W( float val) { if ((  long)val == val) W((  long)val);
+                                else { _IO.W((byte)0xCA); _IO.WE(val, true); } }
+        private void W(double val) { if ((  long)val == val) W((  long)val);
+                                else if (( float)val == val) W(( float)val);
+                                else { _IO.W((byte)0xCB); _IO.WE(val, true); } }
+
+        private void W(  bool val) =>
+            _IO.W((byte)(val ? 0xC3 : 0xC2));
+
+        private void W(byte[] val)
+        {
+            if (val == null) { WN(); return; }
+
+                 if (val.Length <   0x100) { _IO.W((byte)0xC4); _IO.W ((  byte)val.Length      ); }
+            else if (val.Length < 0x10000) { _IO.W((byte)0xC5); _IO.WE((ushort)val.Length, true); }
+            else                           { _IO.W((byte)0xC6); _IO.WE(        val.Length, true); }
+            _IO.W(val);
+        }
+
+        private void W(string val)
+        {
+            if (val == null) { WN(); return; }
+
+            byte[] array = Text.ToUTF8(val);
+                 if (array.Length <    0x20)   _IO.W((byte)(0xA0 | (array.Length & 0x1F)));
+            else if (array.Length <   0x100) { _IO.W((byte)0xD9); _IO.W ((  byte)array.Length); }
+            else if (array.Length < 0x10000) { _IO.W((byte)0xDA); _IO.WE((ushort)array.Length, true); }
+            else                             { _IO.W((byte)0xDB); _IO.WE(        array.Length, true); }
+            _IO.W(array);
+        }
+
+        private void WN() => _IO.W((byte)0xC0);
+
+        private void WA(int val)
+        {
+                 if (val ==      0) { WN(); return; }
+            else if (val <    0x10)   _IO.W((byte)(0x90 | (val & 0x0F)));
+            else if (val < 0x10000) { _IO.W((byte)0xDC); _IO.WE((ushort)val, true); }
+            else                    { _IO.W((byte)0xDD); _IO.WE(        val, true); }
+        }
+
+        private void WM(int val)
+        {
+                 if (val ==      0) { WN(); return; }
+            else if (val <    0x10)   _IO.W((byte)(0x80 | (val & 0x0F)));
+            else if (val < 0x10000) { _IO.W((byte)0xDE); _IO.WE((ushort)val, true); }
+            else                    { _IO.W((byte)0xDF); _IO.WE(        val, true); }
+        }
+
+        private void W(MsgPack.Ext val) => WE(val);
+
+        private void WE(MsgPack.Ext val)
+        {
+            if (val.Data == null) { WN(); return; }
+
+                 if (val.Data.Length <  1 ) { WN(); return; }
+            else if (val.Data.Length == 1 ) _IO.W((byte)0xD4);
+            else if (val.Data.Length == 2 ) _IO.W((byte)0xD5);
+            else if (val.Data.Length == 4 ) _IO.W((byte)0xD6);
+            else if (val.Data.Length == 8 ) _IO.W((byte)0xD7);
+            else if (val.Data.Length == 16) _IO.W((byte)0xD8);
+            else
+            {
+                     if (val.Data.Length <   0x100)
+                { _IO.W((byte)0xC7); _IO.W ((  byte)val.Data.Length); }
+                else if (val.Data.Length < 0x10000)
+                { _IO.W((byte)0xC8); _IO.WE((ushort)val.Data.Length, true); }
+                else
+                { _IO.W((byte)0xC9); _IO.WE(        val.Data.Length, true); }
+            }
+            _IO.W(val.Type);
+            _IO.W(val.Data);
+        }
+
+        public void Dispose() => _IO.C();
+    }
+
+    public enum Types : byte
+    {
+        PosInt    = 0b00000000,
+        FixMap    = 0b10000000,
+        FixArr    = 0b10010000,
+        FixStr    = 0b10100000,
+        Nil       = 0b11000000,
+        NeverUsed = 0b11000001,
+        False     = 0b11000010,
+        True      = 0b11000011,
+        Bin8      = 0b11000100,
+        Bin16     = 0b11000101,
+        Bin32     = 0b11000110,
+        Ext8      = 0b11000111,
+        Ext16     = 0b11001000,
+        Ext32     = 0b11001001,
+        Float32   = 0b11001010,
+        Float64   = 0b11001011,
+        UInt8     = 0b11001100,
+        UInt16    = 0b11001101,
+        UInt32    = 0b11001110,
+        UInt64    = 0b11001111,
+        Int8      = 0b11010000,
+        Int16     = 0b11010001,
+        Int32     = 0b11010010,
+        Int64     = 0b11010011,
+        FixExt1   = 0b11010100,
+        FixExt2   = 0b11010101,
+        FixExt4   = 0b11010110,
+        FixExt8   = 0b11010111,
+        FixExt16  = 0b11011000,
+        Str8      = 0b11011001,
+        Str16     = 0b11011010,
+        Str32     = 0b11011011,
+        Arr16     = 0b11011100,
+        Arr32     = 0b11011101,
+        Map16     = 0b11011110,
+        Map32     = 0b11011111,
+        NegInt    = 0b11100000,
+        PosIntMax = 0b01111111,
+        FixMapMax = 0b10001111,
+        FixArrMax = 0b10011111,
+        FixStrMax = 0b10111111,
+        NegIntMax = 0b11111111,
+    }
+}
diff --git a/KKdMainLib/KKdMainLib.csproj b/KKdMainLib/KKdMainLib.csproj
index 5c190df..1878f1f 100644
--- a/KKdMainLib/KKdMainLib.csproj
+++ b/KKdMainLib/KKdMainLib.csproj
@@ -4,14 +4,14 @@
     <Authors>korenkonder</Authors>
     <Company></Company>
     <Configuration></Configuration>
-    <Copyright>korenkonder (C) 2018-2023</Copyright>
+    <Copyright>korenkonder (C) 2018-2024</Copyright>
     <Description>A simple library for working with Project Diva AC/DT/F/AFT/F2/X/XHD/FT/VRFL/M39 files</Description>
-    <FileVersion>0.4.10.19</FileVersion>
+    <FileVersion>0.4.11.0</FileVersion>
     <PackageId>KKdMainLib</PackageId>
     <Product>KKdMainLib</Product>
     <TargetFramework>net461</TargetFramework>
     <Title>KKdMainLib</Title>
-    <Version>0.4.10.19</Version>
+    <Version>0.4.11.0</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/KKdMainLib/MotHead.cs b/KKdMainLib/MotHead.cs
index 5505ba7..8abfade 100644
--- a/KKdMainLib/MotHead.cs
+++ b/KKdMainLib/MotHead.cs
@@ -200,15 +200,15 @@ RETURN:
                         {
                             ref HeaderData.Sub.Data data = ref Header.Data[i].Array[i0];
                             int Size = GetSize(data.Type);
-                            if (data.Array == null || data.Array.Length < 1 || Size < 1) continue;
-
-                            switch ((int)data.Type)
-                            {
-                                case 0x3E:
-                                case 0x49:
-                                case 0x4B:
-                                    s.A(0x20, true);
-                                    break;
+                            if (data.Array == null || data.Array.Length < 1 || Size < 1) continue;
+
+                            switch ((int)data.Type)
+                            {
+                                case 0x3E:
+                                case 0x49:
+                                case 0x4B:
+                                    s.A(0x20, true);
+                                    break;
                             }
 
                             if (data.Array.Length >= 4 && s.P % 0x4 != 0)
diff --git a/KKdMainLib/libdeflate.dll b/KKdMainLib/libdeflate.dll
index f83a5d3..7b5ab03 100644
Binary files a/KKdMainLib/libdeflate.dll and b/KKdMainLib/libdeflate.dll differ
diff --git a/KKdSoundLib/VAG.cs b/KKdSoundLib/VAG.cs
index 02872eb..eff9e0b 100644
--- a/KKdSoundLib/VAG.cs
+++ b/KKdSoundLib/VAG.cs
@@ -1,828 +1,828 @@
-using KKdBaseLib;
-using KKdMainLib.IO;
-
-namespace KKdSoundLib
-{
-    public unsafe struct VAG : System.IDisposable
-    {
-        private int c, d0, d1, e, g, i, i1, i2, j, s, PrNR, ShF, PrNRCount;
-        private bool h;
-        private int VBS;
-        private float f;
-        private ushort ch;
-        private const int BS = 28; //VAGBlockSize
-        private bool Success;
-
-        public VAGFile VAGData;
-
-        public void VAGReader(string file)
-        {
-            Success = false;
-            if (!File.Exists(file + ".vag")) return;
-
-            VAGData = new VAGFile();
-            Stream reader = File.OpenReader(file + ".vag", true);
-
-            if (reader.RU32() != 0x70474156) return;
-
-            VAGData.Version = reader.RU32E(true);
-            reader.RU32();
-            VAGData.Size = reader.RI32E(true);
-            VAGData.SampleRate = reader.RI32E(true);
-            reader.RU32();
-            reader.RU32();
-            reader.RU16();
-            VAGData.Channels = reader.RU16();
-            if (VAGData.Channels < 2) VAGData.Channels = 1;
-            byte[] name = reader.RBy(0x10);
-            for (i = 0; i < 0x10; i++)
-                VAGData.Name[i] = name[i];
-            name = null;
-
-            bool HEVAG = VAGData.Version == 0x00020001 || VAGData.Version == 0x00030000;
-            if (!HEVAG) VAGData.Channels = 1;
-            ch = VAGData.Channels;
-            VBS = BS * ch;
-
-            int[] samp = new int[ch * 4];
-            if (VAGData.Size + 0x30 > reader.LI64) VAGData.Size = reader.L - 0x30;
-            VAGData.Size = (VAGData.Size / VAGData.Channels) >> 4;
-            VAGData.Flags = new byte [VAGData.Size];
-            VAGData.Data = new int[VAGData.Size * VBS];
-            fixed (int* sampPtr = samp)
-            fixed (int* shF = ShiftFactor)
-            fixed (int* HEVAG1 = VAG.HEVAG1)
-            fixed (int* HEVAG2 = VAG.HEVAG2)
-            fixed (int* HEVAG3 = VAG.HEVAG3)
-            fixed (int* HEVAG4 = VAG.HEVAG4)
-            fixed (int* dataPtr = VAGData.Data)
-            {
-                int* v1 = sampPtr;
-                int* v2 = sampPtr + ch;
-                int* v3 = sampPtr + ch * 2;
-                int* v4 = sampPtr + ch * 3;
-                int* localDataPtr = dataPtr;
-                for (i1 = 0; i1 < VAGData.Size; i1++, localDataPtr += VBS)
-                    for (c = 0; c < ch; c++)
-                    {
-                        s = reader.RU8();
-                        PrNR = (s & 0xF0) >> 4;
-                        ShF  =  s & 0x0F;
-                        s = reader.RU8();
-                        PrNR = (s & 0xF0) | PrNR;
-                        VAGData.Flags[i1] = (byte)(s & 0xF);
-
-                        for (i = 0, i2 = 1; i < BS; i += 2, i2 += 2)
-                        {
-                            s = reader.RU8();
-                            fourBit[i ] =  s & 0x0F;
-                            fourBit[i2] = (s & 0xF0) >> 4;
-                        }
-
-                        HEVAG_1 = HEVAG1[PrNR]; HEVAG_2 = HEVAG2[PrNR];
-                        HEVAG_3 = HEVAG3[PrNR]; HEVAG_4 = HEVAG4[PrNR];
-                        s1 = v1[c]; s2 = v2[c]; s3 = v3[c]; s4 = v4[c];
-                        ShFf = 20 - ShF;
-                        for (i = 0; i < BS; i++)
-                        {
-                            d0 = shF[fourBit[i]] << ShFf;
-
-                            g = ((s1 * HEVAG_1 + s2 * HEVAG_2 + s3 * HEVAG_3 + s4 * HEVAG_4) >> 5) + d0;
-                            s4 = s3; s3 = s2; s2 = s1; s1 = g >> 8;
-                            localDataPtr[i * ch + c] = g;
-                        }
-                        v1[c] = s1; v2[c] = s2; v3[c] = s3; v4[c] = s4;
-                    }
-            }
-
-            reader.C();
-            Success = true;
-        }
-
-        public void VAGWriter(string file, string choose)
-        {
-            bool HEVAG = choose != "1";
-            if (!Success) return;
-            Stream writer = File.OpenWriter(file + ".vag", true);
-            byte[] name = Path.GetFileName(file).ToASCII();
-            System.Array.Resize(ref name, 0x10);
-            for (i = 0; i < 0x10; i++)
-                VAGData.Name[i] = name[i];
-            PrNRCount = choose == "1" ? 5 : choose == "2" ? 5 : choose == "3" ? 32
-                : choose == "4" ? 32 : choose == "5" ? 64 : choose == "6" ? 96 : 128;
-
-            writer.W(0x70474156);
-            writer.WE(HEVAG ? 0x00020001 : 0x00000020, true);
-            writer.W(0);
-            writer.WE(((VAGData.Size + 1) * (HEVAG ? ch : 1)) << 4, true);
-            writer.WE(VAGData.SampleRate, true);
-            writer.W(0);
-            writer.W(0);
-            writer.W((ushort)0);
-            writer.W((ushort)(HEVAG ? VAGData.Channels : 0x1));
-            writer.W(name, 0x10);
-            writer.P = 0x30;
-
-            int[] samp = new int[HEVAG ? ch * (PrNRCount > 29 ? 8 : 4) : 4];
-            fixed (int* sampPtr = samp)
-            fixed (int* HEVAG1 = VAG.HEVAG1)
-            fixed (int* HEVAG2 = VAG.HEVAG2)
-            fixed (int* HEVAG3 = VAG.HEVAG3)
-            fixed (int* HEVAG4 = VAG.HEVAG4)
-            fixed (int* dataPtr = VAGData.Data)
-            {
-                c = HEVAG ? ch : 1;
-                int*  v1 = sampPtr;
-                int*  v2 = sampPtr + c;
-                int* tV1 = sampPtr + c * 2;
-                int* tV2 = sampPtr + c * 3;
-
-                for (i1 = 0; i1 < c; i1++)
-                {
-                     v1[i1] = 0;
-                     v2[i1] = 0;
-                    tV1[i1] = 0;
-                    tV2[i1] = 0;
-                }
-
-                if (HEVAG && PrNRCount > 29)
-                {
-                    int*  v3 = sampPtr + c * 4;
-                    int*  v4 = sampPtr + c * 5;
-                    int* tV3 = sampPtr + c * 6;
-                    int* tV4 = sampPtr + c * 7;
-
-                    for (i1 = 0; i1 < c; i1++)
-                    {
-                         v3[i1] = 0;
-                         v4[i1] = 0;
-                        tV3[i1] = 0;
-                        tV4[i1] = 0;
-                    }
-
-                    for (i1 = 0; i1 < VAGData.Size; i1++)
-                        for (c = 0; c < ch; c++)
-                        {
-                            for (i = 0, h = false; i < BS; i++)
-                            {
-                                dataBuf[i] = dataPtr[i1 * BS * ch + i * ch + c];
-                                if (dataBuf[i] != 0) h = true;
-                            }
-
-                            if (h)
-                            {
-                                Calc4BitsHEVAG(HEVAG1, HEVAG2, HEVAG3, HEVAG4, v1 + c, v2 + c,
-                                    v3 + c, v4 + c, tV1 + c, tV2 + c, tV3 + c, tV4 + c);
-
-                                s = ((PrNR & 0xF) << 4) | (ShF & 0xF);
-                                writer.W((byte)s);
-                                s = (PrNR & 0xF0) | (VAGData.Flags[i1] & 0xF);
-                                writer.W((byte)s);
-                                for (i = 0, i2 = 1; i < BS; i += 2, i2 += 2)
-                                {
-                                    s = ((fourBit[i2] & 0xF) << 4) | (fourBit[i] & 0xF);
-                                    writer.W((byte)s);
-                                }
-                            }
-                            else
-                            {
-                                 v1[c] = 0;  v2[c] = 0;  v3[c] = 0;  v4[c] = 0;
-                                tV1[c] = 0; tV2[c] = 0; tV3[c] = 0; tV4[c] = 0;
-                                s = (VAGData.Flags[i1] & 0xF) << 8;
-                                writer.W(s);
-                                writer.W(0);
-                                writer.W(0);
-                                writer.W(0);
-                            }
-                        }
-                }
-                else if (HEVAG)
-                    for (i1 = 0; i1 < VAGData.Size; i1++)
-                        for (c = 0; c < ch; c++)
-                        {
-                            for (i = 0, h = false; i < BS; i++)
-                            {
-                                dataBuf[i] = dataPtr[i1 * BS * ch + i * ch + c];
-                                if (dataBuf[i] != 0) h = true;
-                            }
-
-                            if (h)
-                            {
-                                Calc4BitsVAG(HEVAG1, HEVAG2, v1 + c, v2 + c, tV1 + c, tV2 + c);
-
-                                s = ((PrNR & 0xF) << 4) | (ShF & 0xF);
-                                writer.W((byte)s);
-                                s = (PrNR & 0xF0) | (VAGData.Flags[i1] & 0xF);
-                                writer.W((byte)s);
-                                for (i = 0, i2 = 1; i < BS; i += 2, i2 += 2)
-                                {
-                                    s = ((fourBit[i2] & 0xF) << 4) | (fourBit[i] & 0xF);
-                                    writer.W((byte)s);
-                                }
-                            }
-                            else
-                            {
-                                 v1[c] = 0;  v2[c] = 0;
-                                tV1[c] = 0; tV2[c] = 0;
-                                s = (VAGData.Flags[i1] & 0xF) << 8;
-                                writer.W(s);
-                                writer.W(0);
-                                writer.W(0);
-                                writer.W(0);
-                            }
-                        }
-                else
-                    for (i1 = 0; i1 < VAGData.Size; i1++)
-                    {
-                        for (i = 0, h = false; i < BS; i++)
-                        {
-                            for (c = 0, s = 0, dataBuf[i] = 0; c < ch; c++)
-                                dataBuf[i] += dataPtr[i1 * BS * ch + i * ch + c];
-                            dataBuf[i] /= ch;
-                            if (dataBuf[i] != 0) h = true;
-                        }
-
-                        if (h)
-                        {
-                            Calc4BitsVAG(HEVAG1, HEVAG2, v1, v2, tV1, tV2);
-
-                            s = ((PrNR & 0xF) << 4) | (ShF & 0xF);
-                            writer.W((byte)s);
-                            s = VAGData.Flags[i1] & 0xF;
-                            writer.W((byte)s);
-                            for (i = 0, i2 = 1; i < BS; i += 2, i2 += 2)
-                            {
-                                s = ((fourBit[i2] & 0xF) << 4) | (fourBit[i] & 0xF);
-                                writer.W((byte)s);
-                            }
-                        }
-                        else
-                        {
-                            * v1 = 0; * v2 = 0;
-                            *tV1 = 0; *tV2 = 0;
-                            s = (VAGData.Flags[i1] & 0xF) << 8;
-                            writer.W(s);
-                            writer.W(0);
-                            writer.W(0);
-                            writer.W(0);
-                        }
-                    }
-            }
-
-            if (!HEVAG) ch = 1;
-            for (c = 0; c < ch; c++)
-            {
-                writer.W(0x77770700);
-                writer.W(0x77777777);
-                writer.W(0x77777777);
-                writer.W(0x77777777);
-            }
-
-            if (writer.P % 0x20 > 0)
-            {
-                writer.W(0x10101010);
-                writer.W(0x10101010);
-                writer.W(0x10101010);
-                writer.W(0x10101010);
-            }
-            writer.C();
-        }
-
-        private fixed int dataBuf[(int)BS];
-        private fixed int fourBit[(int)BS];
-        private fixed int tempBuf[(int)BS];
-        private int err, max, min, ShM, s1, s2, s3, s4, tS1, tS2, tS3, tS4, PrNRf, ShFf;
-        private int HEVAG_1, HEVAG_2, HEVAG_3, HEVAG_4;
-
-        private void Calc4BitsVAG(int* HEVAG1, int* HEVAG2, int* v1, int* v2, int* tV1, int* tV2)
-        {
-            min = 0x7FFFFFFF;
-            PrNRf = 0;
-            for (j = 0; j < PrNRCount; j++)
-            {
-                PrNR = j;
-
-                Calc4Bits_VAG(HEVAG1, HEVAG2, v1, v2, tV1, tV2);
-
-                s1 = *v1; s2 = *v2;
-                err = 0;
-                for (i = 0; i < BS; i++)
-                {
-                    d0 = fourBit[i] << ShFf;
-
-                    g = ((s1 * HEVAG_1 + s2 * HEVAG_2) >> 5) + d0;
-                    s2 = s1; s1 = g >> 8;
-                    e = dataBuf[i] - g;
-                    g = e >> 31;
-                    err += (e + g) ^ g;
-                }
-
-                if (err < min) { PrNRf = j; min = err; }
-            }
-            PrNR = PrNRf;
-
-            Calc4Bits_VAG(HEVAG1, HEVAG2, v1, v2, tV1, tV2);
-            * v1 =  s1; * v2 =  s2;
-            *tV1 = tS1; *tV2 = tS2;
-        }
-
-        private void Calc4Bits_VAG(int* HEVAG1, int* HEVAG2, int* v1, int* v2, int* tV1, int* tV2)
-        {
-            s1 = *v1; s2 = *v2;
-            HEVAG_1 = HEVAG1[PrNR]; HEVAG_2 = HEVAG2[PrNR];
-
-            for (i = 0, max = 0; i < BS; i++)
-            {
-                g = dataBuf[i];
-                e = (s1 * HEVAG_1 + s2 * HEVAG_2) >> 5;
-                e = g - e;
-                s2 = s1; s1 = g >> 8;
-                     if (e >  0x77FFFF) e =  0x77FFFF;
-                else if (e < -0x780000) e = -0x780000;
-                tempBuf[i] = e;
-                g = e >> 31;
-                e = (e + g) ^ g;
-                if (e > max) max = e;
-            }
-
-            for (ShF = 12, ShM = 0x400000; ShF > 0; ShF--, ShM >>= 1)
-                if ((ShM & (max + (ShM >> 4))) == ShM) break;
-            ShFf = 8 + ShF;
-            ShF = 12 - ShF;
-
-            tS1 = *tV1; tS2 = *tV2;
-            for (i = 0; i < BS; i++)
-            {
-                g = tempBuf[i];
-                e = (tS1 * HEVAG_1 + tS2 * HEVAG_2) >> 5;
-                e = g - e;
-
-                d1 = e << ShF;
-                d0 = (d1 + 0x80000) >> 20;
-                     if (d0 >  7) d0 =  7;
-                else if (d0 < -8) d0 = -8;
-                fourBit[i] = d0;
-                d0 <<= ShFf;
-
-                tS2 = tS1; tS1 = (d0 - e) >> 8;
-            }
-        }
-
-        private void Calc4BitsHEVAG(int* HEVAG1, int* HEVAG2, int* HEVAG3, int* HEVAG4,
-            int* v1, int* v2, int* v3, int* v4, int* tV1, int* tV2, int* tV3, int* tV4)
-        {
-            min = 0x7FFFFFFF;
-            PrNRf = 0;
-            for (j = 0; j < PrNRCount; j++)
-            {
-                PrNR = j;
-
-                Calc4Bits_HEVAG(HEVAG1, HEVAG2, HEVAG3, HEVAG4, v1, v2, v3, v4, tV1, tV2, tV3, tV4);
-
-                s1 = *v1; s2 = *v2; s3 = *v3; s4 = *v4;
-                err = 0;
-                for (i = 0; i < BS; i++)
-                {
-                    d0 = fourBit[i] << ShFf;
-
-                    g = ((s1 * HEVAG_1 + s2 * HEVAG_2 + s3 * HEVAG_3 + s4 * HEVAG_4) >> 5) + d0;
-                    s4 = s3; s3 = s2; s2 = s1; s1 = g >> 8;
-                    e = dataBuf[i] - g;
-                    g = e >> 31;
-                    err += (e + g) ^ g;
-                }
-
-                if (err < min) { PrNRf = j; min = err; }
-            }
-            PrNR = PrNRf;
-
-            Calc4Bits_HEVAG(HEVAG1, HEVAG2, HEVAG3, HEVAG4, v1, v2, v3, v4, tV1, tV2, tV3, tV4);
-            * v1 =  s1; * v2 =  s2; * v3 =  s3; * v4 =  s4;
-            *tV1 = tS1; *tV2 = tS2; *tV3 = tS3; *tV4 = tS4;
-        }
-
-        private void Calc4Bits_HEVAG(int* HEVAG1, int* HEVAG2, int* HEVAG3, int* HEVAG4,
-            int* v1, int* v2, int* v3, int* v4, int* tV1, int* tV2, int* tV3, int* tV4)
-        {
-            s1 = *v1; s2 = *v2; s3 = *v3; s4 = *v4;
-            HEVAG_1 = HEVAG1[PrNR]; HEVAG_2 = HEVAG2[PrNR];
-            HEVAG_3 = HEVAG3[PrNR]; HEVAG_4 = HEVAG4[PrNR];
-
-            for (i = 0, max = 0; i < BS; i++)
-            {
-                g = dataBuf[i];
-                e = (s1 * HEVAG_1 + s2 * HEVAG_2 + s3 * HEVAG_3 + s4 * HEVAG_4) >> 5;
-                e = g - e;
-                s4 = s3; s3 = s2; s2 = s1; s1 = g >> 8;
-
-                     if (e >  0x77FFFF) e =  0x77FFFF;
-                else if (e < -0x780000) e = -0x780000;
-                tempBuf[i] = e;
-                g = e >> 31;
-                e = (e + g) ^ g;
-                if (e > max) max = e;
-            }
-
-            for (ShF = 12, ShM = 0x400000; ShF > 0; ShF--, ShM >>= 1)
-                if ((ShM & (max + (ShM >> 4))) == ShM) break;
-            ShFf = 8 + ShF;
-            ShF = 12 - ShF;
-
-            tS1 = *tV1; tS2 = *tV2; tS3 = *tV3; tS4 = *tV4;
-            for (i = 0; i < BS; i++)
-            {
-                g = tempBuf[i];
-                e = (tS1 * HEVAG_1 + tS2 * HEVAG_2 + tS3 * HEVAG_3 + tS4 * HEVAG_4) >> 5;
-                e = g - e;
-
-                d1 = e << ShF;
-                d0 = (d1 + 0x80000) >> 20;
-                     if (d0 >  7) d0 =  7;
-                else if (d0 < -8) d0 = -8;
-                fourBit[i] = d0;
-                d0 <<= ShFf;
-
-                tS4 = tS3; tS3 = tS2; tS2 = tS1; tS1 = (d0 - e) >> 8;
-            }
-        }
-
-        public int WAVReaderStraight(string file, bool ExtendedFlagging = false)
-        {
-            Success = false;
-            VAGData = new VAGFile();
-            Stream reader = File.OpenReader(file + ".wav");
-            WAV.Header Header = reader.ReadWAVHeader();
-            if (!Header.IsSupported) { reader.C(); return 1; }
-            ch = Header.Channels;
-            VBS = BS * ch;
-
-            VAGData.Size = Header.Size / Header.Bytes;
-            VAGData.Data = new int[VAGData.Size.A(VBS)];
-            fixed (int* dataPtr = VAGData.Data)
-            {
-                int* localDataPtr = dataPtr;
-                     if (Header.Bytes == 1 && Header.Format == 0x01)
-                    for (int i1 = 0; i1 < VAGData.Size; i1++, localDataPtr++)
-                        *localDataPtr =      (reader.RU8  () - 0x80) << 16;
-                else if (Header.Bytes == 2 && Header.Format == 0x01)
-                    for (int i1 = 0; i1 < VAGData.Size; i1++, localDataPtr++)
-                        *localDataPtr =       reader.RI16 () << 8;
-                else if (Header.Bytes == 3 && Header.Format == 0x01)
-                    for (int i1 = 0; i1 < VAGData.Size; i1++, localDataPtr++)
-                        *localDataPtr =       reader.RU8  () | (reader.RI16() << 8);
-                else if (Header.Bytes == 4 && Header.Format == 0x01)
-                    for (int i1 = 0; i1 < VAGData.Size; i1++, localDataPtr++)
-                        *localDataPtr =       reader.RI32 () >> 8;
-                else if (Header.Bytes == 4 && Header.Format == 0x03)
-                    for (int i1 = 0; i1 < VAGData.Size; i1++, localDataPtr++)
-                        *localDataPtr = (int)(reader.RF32() * 8388608.0);
-                else if (Header.Bytes == 8 && Header.Format == 0x03)
-                    for (int i1 = 0; i1 < VAGData.Size; i1++, localDataPtr++)
-                        *localDataPtr = (int)(reader.RF64() * 8388608.0);
-            }
-
-            VAGData.Size = VAGData.Size.A(VBS, VBS);
-            VAGData.Channels = ch;
-            VAGData.SampleRate = Header.SampleRate;
-            VAGData.Flags = new byte[VAGData.Size];
-            if (ExtendedFlagging) VAGData.Flags[0] = 0x4;
-            VAGData.Flags[VAGData.Size - 1] = 0x1;
-
-            reader.C();
-            Success = true;
-            return 0;
-        }
-
-        public int WAVReader(string file, bool ExtendedFlagging = false)
-        {
-            Success = false;
-            string[] Files;
-            bool HasLoop = false;
-            bool[] Loop;
-            {
-                if (!file.EndsWith(".0")) return WAVReaderStraight(file);
-                file = file.Remove(file.Length - 2);
-                i2 = 0;
-                System.Collections.Generic.List<string> files =
-                    new System.Collections.Generic.List<string>();
-                System.Collections.Generic.List<  bool>  loop =
-                    new System.Collections.Generic.List<  bool>();
-                while (true)
-                {
-                         if (File.Exists(file + "." + i2 +      ".wav"))
-                    { files.Add(file + "." + i2 +      ".wav"); loop.Add(false);                 }
-                    else if (File.Exists(file + "." + i2 + ".loop.wav"))
-                    { files.Add(file + "." + i2 + ".loop.wav"); loop.Add( true); HasLoop = true; }
-                    else break;
-                    i2++;
-                }
-                Files = files.ToArray();
-                Loop  = loop .ToArray();
-            }
-
-            int[] Sizes = new int[Files.Length];
-            ushort Channels = 0;
-            int AlignVAG, Size = 0, SampleRate = 0;
-
-            VAGData = new VAGFile();
-            Stream reader;
-            WAV.Header Header;
-            for (i = 0; i < Files.Length; i++)
-            {
-                reader = File.OpenReader(Files[i]);
-                Header = reader.ReadWAVHeader();
-
-                if (!Header.IsSupported) { reader.C(); return 2; }
-                if (i == 0) { SampleRate = Header.SampleRate;
-                    ch = Channels = Header.Channels; VBS = BS * ch; }
-                if (Header.Channels   != Channels  ) { reader.C(); return 3; }
-                if (Header.SampleRate != SampleRate) { reader.C(); return 4; }
-
-                Sizes[i] = Header.Size / Header.Bytes;
-                Size += Sizes[i].A(VBS);
-                reader.C();
-            }
-
-            VAGData.Size = Size / VBS;
-            VAGData.Data = new int[Size];
-            VAGData.Flags = new byte[VAGData.Size];
-
-            if (HasLoop)
-                for (i = 0; i < VAGData.Size; i++)
-                    VAGData.Flags[i] = 0x2;
-
-            i2 = 0;
-            int Start = 0, End = 0;
-            fixed (int* dataPtr = VAGData.Data)
-            {
-                int* localDataPtr = dataPtr;
-                for (i = 0; i < Files.Length; i++)
-                {
-                    reader = File.OpenReader(Files[i]);
-                    Header = reader.ReadWAVHeader();
-                         if (Header.Bytes == 1 && Header.Format == 0x01)
-                        for (int i1 = 0; i1 < Sizes[i]; i1++, localDataPtr++)
-                            *localDataPtr =      (reader.RU8  () - 0x80) << 16;
-                    else if (Header.Bytes == 2 && Header.Format == 0x01)
-                        for (int i1 = 0; i1 < Sizes[i]; i1++, localDataPtr++)
-                            *localDataPtr =       reader.RI16 () << 8;
-                    else if (Header.Bytes == 3 && Header.Format == 0x01)
-                        for (int i1 = 0; i1 < Sizes[i]; i1++, localDataPtr++)
-                            *localDataPtr =       reader.RU8  () | (reader.RI16() << 8);
-                    else if (Header.Bytes == 4 && Header.Format == 0x01)
-                        for (int i1 = 0; i1 < Sizes[i]; i1++, localDataPtr++)
-                            *localDataPtr =       reader.RI32 () >> 8;
-                    else if (Header.Bytes == 4 && Header.Format == 0x03)
-                        for (int i1 = 0; i1 < Sizes[i]; i1++, localDataPtr++)
-                            *localDataPtr = (int)(reader.RF32() * 8388608.0);
-                    else if (Header.Bytes == 8 && Header.Format == 0x03)
-                        for (int i1 = 0; i1 < Sizes[i]; i1++, localDataPtr++)
-                            *localDataPtr = (int)(reader.RF64() * 8388608.0);
-                    reader.C();
-
-                    AlignVAG = Sizes[i].A(VBS) - Sizes[i];
-                    localDataPtr += AlignVAG;
-
-                    AlignVAG = (Sizes[i] + AlignVAG) / VBS;
-                    End += AlignVAG;
-                    End--;
-                         if (Loop[i]         ) { VAGData.Flags[Start] = 0x6; VAGData.Flags[End] = 0x3; }
-                    else if (ExtendedFlagging)   VAGData.Flags[Start] = 0x4;
-                    if (i + 1 == Files.Length && !Loop[i]) VAGData.Flags[End] = 0x1;
-                    Start += AlignVAG;
-                    End++;
-                }
-            }
-
-            VAGData.Channels = ch;
-            VAGData.SampleRate = SampleRate;
-
-            Success = true;
-            return 0;
-        }
-
-        public void WAVWriterStraight(string file, bool IgnoreEndFlags = false)
-        {
-            if (!Success) return;
-            byte Flag = VAGData.Flags[0];
-            if (Flag == 7) return;
-            WAV.Header Header = new WAV.Header();
-            Stream writer = File.OpenWriter(file + ".wav", true);
-            writer.PI64 = 0x2C;
-
-            fixed (int* dataPtr = VAGData.Data)
-            {
-                int* localDataPtr = dataPtr;
-                if (Flag < 8)
-                    for (i = 0; i < BS; i++)
-                        for (c = 0; c < ch; c++)
-                        {
-                            f = (float)(localDataPtr[i * ch + c] / 8388608.0);
-                            writer.W(f);
-                        }
-                else
-                    for (i = 0; i < BS; i++)
-                        for (c = 0; c < ch; c++)
-                            writer.W(0f);
-
-                for (i1 = 0, i2 = 0; i1 < VAGData.Size; i1++, localDataPtr += VBS)
-                {
-                    Flag = VAGData.Flags[i1];
-                    if (!IgnoreEndFlags && (Flag == 5 || Flag == 7)) break;
-                    if (Flag < 8)
-                        for (i = 0; i < BS; i++)
-                            for (c = 0; c < ch; c++)
-                            {
-                                f = (float)(localDataPtr[i * ch + c] / 8388608.0);
-                                writer.W(f);
-                            }
-                    else
-                        for (i = 0; i < BS; i++)
-                            for (c = 0; c < ch; c++)
-                                writer.W(0f);
-
-                    if (!IgnoreEndFlags && Flag == 1) break;
-                }
-            }
-
-            Header = new WAV.Header { Bytes = 4, Channels = ch, Format = 3,
-                SampleRate = VAGData.SampleRate, Size = writer.P - 0x2C };
-            writer.W(Header, 0);
-            writer.C();
-        }
-
-        public void WAVWriter(string file, bool IgnoreEndFlags = false)
-        {
-            if (!Success) return;
-            byte Flag = VAGData.Flags[0];
-            if (Flag == 7) return;
-            WAV.Header Header = new WAV.Header();
-            Stream writer;
-            if (!IgnoreEndFlags && Flag == 6) writer = File.OpenWriter(file + ".loop.0.wav", true);
-            else                              writer = File.OpenWriter(file +      ".0.wav", true);
-            writer.PI64 = 0x2C;
-
-            fixed (int* dataPtr = VAGData.Data)
-            {
-                int* localDataPtr = dataPtr;
-                if (Flag < 8)
-                    for (i = 0; i < BS; i++)
-                        for (c = 0; c < ch; c++)
-                        {
-                            f = (float)(localDataPtr[i * ch + c] / 8388608.0);
-                            writer.W(f);
-                        }
-                else
-                    for (i = 0; i < BS; i++)
-                        for (c = 0; c < ch; c++)
-                            writer.W(0f);
-
-                localDataPtr += VBS;
-
-                for (i1 = 1, i2 = 0; i1 < VAGData.Size; i1++, localDataPtr += VBS)
-                {
-                    Flag = VAGData.Flags[i1];
-                    if (!IgnoreEndFlags && (Flag == 5 || Flag == 7)) break;
-                    else if (!IgnoreEndFlags && Flag == 6)
-                    {
-                        Header = new WAV.Header { Bytes = 4, Channels = ch, Format = 3,
-                            SampleRate = VAGData.SampleRate, Size = writer.P - 0x2C };
-                        writer.W(Header, 0);
-                        writer.C();
-                        i2++;
-
-                        writer = File.OpenWriter(file + "." + i2 + ".loop.wav", true);
-                        writer.PI64 = 0x2C;
-                    }
-
-                    if (!IgnoreEndFlags && Flag < 8)
-                        for (i = 0; i < BS; i++)
-                            for (c = 0; c < ch; c++)
-                            {
-                                f = (float)(localDataPtr[i * ch + c] / 8388608.0);
-                                writer.W(f);
-                            }
-                    else
-                        for (i = 0; i < BS; i++)
-                            for (c = 0; c < ch; c++)
-                                writer.W(0f);
-
-                         if (!IgnoreEndFlags && Flag == 1) break;
-                    else if (!IgnoreEndFlags && Flag == 3)
-                    {
-                        Header = new WAV.Header { Bytes = 4, Channels = ch, Format = 3,
-                            SampleRate = VAGData.SampleRate, Size = writer.P - 0x2C };
-                        writer.W(Header, 0);
-                        writer.C();
-                        i2++;
-
-                        writer = VAGData.Size == i1 + 1 ? File.OpenWriter()
-                            : File.OpenWriter(file + "." + i2 + ".wav", true);
-                        writer.PI64 = 0x2C;
-                    }
-                }
-            }
-
-            Header = new WAV.Header { Bytes = 4, Channels = ch, Format = 3,
-                SampleRate = VAGData.SampleRate, Size = writer.P - 0x2C };
-            writer.W(Header, 0);
-            writer.C();
-        }
-
-        public void Dispose() { VAGData = default; }
-
-        public struct VAGFile
-        {
-            public int Size;
-            public uint Version;
-            public int SampleRate;
-            public ushort Channels;
-            public fixed byte Name[10];
-            public byte[] Flags;
-            public int[] Data;
-        }
-
-        private static readonly int[] ShiftFactor =
-        { 0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1 };
-
-        private static readonly int[] HEVAG1 =
-        {
-                 0,   7680,  14720,  12544,  15616,  14731,  14507,  13920,
-             13133,  12028,  10764,   9359,   7832,   6201,   4488,   2717,
-               910,   -910,  -2717,  -4488,  -6201,  -7832,  -9359, -10764,
-            -12028, -13133, -13920, -14507, -14731,   5376,  -6400, -10496,
-              -167,  -7430,  -8001,   6018,   3798,  -8237,   9199,  13021,
-             13112,  -1668,   7819,   9571,  10032,  -4745,  -5896,  -1193,
-              2783,  -7334,   6127,   9457,   7876,  -7172,  -7358,  -9170,
-             -2638,   1873,   9214,  13204,  12437,  -2653,   9331,   1642,
-              4246,  -8988,  -2562,   3182,   7937,  10069,   8400,  -8529,
-              9477,     75,  -9143,  -7270,  -2740,   8993,  13101,   9543,
-              5272,  -7696,   7309,  10275,  10940,     24,  -8122,  -8511,
-               326,   8895,  12073,   8729,  12950,  10038,   9385,  -4720,
-              7869,   2450,  10192,  11313,  10154,   9638,   3854,   6699,
-             11082,  -1026,  10396,  10287,   7953,  12689,   6641,  -2348,
-              9290,   4633,  11247,   9807,   9736,   8440,   9307,   1698,
-             10214,   8390,   7201,    -88,   6193,  12325,  13064,   5333,
-        };
-
-        private static readonly int[] HEVAG2 =
-        {
-                0,     0, -6656, -7040, -7680, -7059, -7366, -7522,
-            -7680, -7680, -7680, -7680, -7680, -7680, -7680, -7680,
-            -7680, -7680, -7680, -7680, -7680, -7680, -7680, -7680,
-            -7680, -7680, -7522, -7366, -7059, -9216, -7168, -7424,
-            -2722, -2221, -3166, -4750, -6946, -2596,  1982, -3044,
-            -4487, -3744, -4328, -1336, -2562, -4122,  2378, -9117,
-            -7108, -2062, -2577, -1858, -4483, -1795, -2102, -3509,
-            -2647,  9183,  1859, -3012, -4792, -1144, -1048,  -620,
-            -7585, -3891, -2735,  -483, -3844, -2609, -3297, -2775,
-            -1882, -2241, -4160, -1958,  3745,  1948, -2835, -1961,
-            -4270, -3383,  2523, -2867, -3721,  -310, -2411, -3067,
-            -3846,  2194, -1876, -3423, -3847, -2570, -2757, -5006,
-            -4326, -8597, -2763, -4213, -2716, -1417, -4554, -5659,
-            -3908, -9810, -3746,   988,  3878, -3375,  3166, -7354,
-            -4039, -6403, -4125, -2284, -1536, -3436, -1021, -9025,
-            -2791,  3248,  3316, -7809, -5189, -1290, -4075,  2999,
-        };
-
-        private static readonly int[] HEVAG3 = new int[]
-        {
-                0,     0,     0,     0,     0,     0,     0,     0,
-                0,     0,     0,     0,     0,     0,     0,     0,
-                0,     0,     0,     0,     0,     0,     0,     0,
-                0,     0,     0,     0,     0,  3328, -3328, -3584,
-             -494, -2298, -2814,  2649,  3875, -2071, -1382, -3792,
-            -2250, -6456,  2111,  -757,   300, -5486, -4787, -1237,
-            -1575, -2212,  -315,   102,  2126, -2069, -2233, -2674,
-            -1929,  1860, -1124, -4139,  -256, -3182,  -828,  -946,
-             -533, -2807, -1730,  -714,  2821,   314,  1551, -2432,
-              108,  -298, -2963, -2156,  5936,  -683, -3854,   130,
-             3124, -2907,   434,   391,   665, -1262, -2311, -2337,
-              419,  -541, -2017,  1674, -3007,   302,  1008, -2852,
-             2135,  1299,   360,   833,   345,  -737,  2843,  2249,
-              728,  -805,  1367, -1915,  -764, -3354,   231, -1944,
-             1885,  1748,   802,   219,  -706,  1562,  -835,   688,
-              368,  -758,    46,  -538,  2760, -3284, -2824,   775,
-        };
-
-        private static readonly int[] HEVAG4 = new int[]
-        {
-                0,     0,     0,     0,     0,     0,     0,     0,
-                0,     0,     0,     0,     0,     0,     0,     0,
-                0,     0,     0,     0,     0,     0,     0,     0,
-                0,     0,     0,     0,     0, -3072, -2304, -1024,
-             -541,   424,   289, -1298, -1216,   227, -2316,  1267,
-             1665,   840,  -506,   487,   199, -1493, -6947, -3114,
-            -1447,   446,   -18,   258,  -538,   482,   440,  -391,
-            -1637, -5746, -2427,  1370,   622, -6878,   507, -4229,
-            -2259,    44, -1899, -1421, -1019,   195,  -155,  -336,
-              256, -6937,     5,   460, -1089, -2704,  1055,   250,
-            -3157,  -456, -2461,   172,    97,   320,  -271,   163,
-             -933, -2880,  -601,  -169,  1946,   198,    41, -1161,
-             -501, -2780,   181,    53,   185,   482, -3397, -1074,
-               80, -3462,   -96, -1437, -3263,  2079, -2089, -4122,
-             -246, -1619,    61,   222,   473,  -176,   509, -3037,
-              179, -2989, -2614, -4571, -1245,   253,  1877, -1132,
-        };
-    }
-}
+using KKdBaseLib;
+using KKdMainLib.IO;
+
+namespace KKdSoundLib
+{
+    public unsafe struct VAG : System.IDisposable
+    {
+        private int c, d0, d1, e, g, i, i1, i2, j, s, PrNR, ShF, PrNRCount;
+        private bool h;
+        private int VBS;
+        private float f;
+        private ushort ch;
+        private const int BS = 28; //VAGBlockSize
+        private bool Success;
+
+        public VAGFile VAGData;
+
+        public void VAGReader(string file)
+        {
+            Success = false;
+            if (!File.Exists(file + ".vag")) return;
+
+            VAGData = new VAGFile();
+            Stream reader = File.OpenReader(file + ".vag", true);
+
+            if (reader.RU32() != 0x70474156) return;
+
+            VAGData.Version = reader.RU32E(true);
+            reader.RU32();
+            VAGData.Size = reader.RI32E(true);
+            VAGData.SampleRate = reader.RI32E(true);
+            reader.RU32();
+            reader.RU32();
+            reader.RU16();
+            VAGData.Channels = reader.RU16();
+            if (VAGData.Channels < 2) VAGData.Channels = 1;
+            byte[] name = reader.RBy(0x10);
+            for (i = 0; i < 0x10; i++)
+                VAGData.Name[i] = name[i];
+            name = null;
+
+            bool HEVAG = VAGData.Version == 0x00020001 || VAGData.Version == 0x00030000;
+            if (!HEVAG) VAGData.Channels = 1;
+            ch = VAGData.Channels;
+            VBS = BS * ch;
+
+            int[] samp = new int[ch * 4];
+            if (VAGData.Size + 0x30 > reader.LI64) VAGData.Size = reader.L - 0x30;
+            VAGData.Size = (VAGData.Size / VAGData.Channels) >> 4;
+            VAGData.Flags = new byte [VAGData.Size];
+            VAGData.Data = new int[VAGData.Size * VBS];
+            fixed (int* sampPtr = samp)
+            fixed (int* shF = ShiftFactor)
+            fixed (int* HEVAG1 = VAG.HEVAG1)
+            fixed (int* HEVAG2 = VAG.HEVAG2)
+            fixed (int* HEVAG3 = VAG.HEVAG3)
+            fixed (int* HEVAG4 = VAG.HEVAG4)
+            fixed (int* dataPtr = VAGData.Data)
+            {
+                int* v1 = sampPtr;
+                int* v2 = sampPtr + ch;
+                int* v3 = sampPtr + ch * 2;
+                int* v4 = sampPtr + ch * 3;
+                int* localDataPtr = dataPtr;
+                for (i1 = 0; i1 < VAGData.Size; i1++, localDataPtr += VBS)
+                    for (c = 0; c < ch; c++)
+                    {
+                        s = reader.RU8();
+                        PrNR = (s & 0xF0) >> 4;
+                        ShF  =  s & 0x0F;
+                        s = reader.RU8();
+                        PrNR = (s & 0xF0) | PrNR;
+                        VAGData.Flags[i1] = (byte)(s & 0xF);
+
+                        for (i = 0, i2 = 1; i < BS; i += 2, i2 += 2)
+                        {
+                            s = reader.RU8();
+                            fourBit[i ] =  s & 0x0F;
+                            fourBit[i2] = (s & 0xF0) >> 4;
+                        }
+
+                        HEVAG_1 = HEVAG1[PrNR]; HEVAG_2 = HEVAG2[PrNR];
+                        HEVAG_3 = HEVAG3[PrNR]; HEVAG_4 = HEVAG4[PrNR];
+                        s1 = v1[c]; s2 = v2[c]; s3 = v3[c]; s4 = v4[c];
+                        ShFf = 20 - ShF;
+                        for (i = 0; i < BS; i++)
+                        {
+                            d0 = shF[fourBit[i]] << ShFf;
+
+                            g = ((s1 * HEVAG_1 + s2 * HEVAG_2 + s3 * HEVAG_3 + s4 * HEVAG_4) >> 5) + d0;
+                            s4 = s3; s3 = s2; s2 = s1; s1 = g >> 8;
+                            localDataPtr[i * ch + c] = g;
+                        }
+                        v1[c] = s1; v2[c] = s2; v3[c] = s3; v4[c] = s4;
+                    }
+            }
+
+            reader.C();
+            Success = true;
+        }
+
+        public void VAGWriter(string file, string choose)
+        {
+            bool HEVAG = choose != "1";
+            if (!Success) return;
+            Stream writer = File.OpenWriter(file + ".vag", true);
+            byte[] name = Path.GetFileName(file).ToASCII();
+            System.Array.Resize(ref name, 0x10);
+            for (i = 0; i < 0x10; i++)
+                VAGData.Name[i] = name[i];
+            PrNRCount = choose == "1" ? 5 : choose == "2" ? 5 : choose == "3" ? 32
+                : choose == "4" ? 32 : choose == "5" ? 64 : choose == "6" ? 96 : 128;
+
+            writer.W(0x70474156);
+            writer.WE(HEVAG ? 0x00020001 : 0x00000020, true);
+            writer.W(0);
+            writer.WE(((VAGData.Size + 1) * (HEVAG ? ch : 1)) << 4, true);
+            writer.WE(VAGData.SampleRate, true);
+            writer.W(0);
+            writer.W(0);
+            writer.W((ushort)0);
+            writer.W((ushort)(HEVAG ? VAGData.Channels : 0x1));
+            writer.W(name, 0x10);
+            writer.P = 0x30;
+
+            int[] samp = new int[HEVAG ? ch * (PrNRCount > 29 ? 8 : 4) : 4];
+            fixed (int* sampPtr = samp)
+            fixed (int* HEVAG1 = VAG.HEVAG1)
+            fixed (int* HEVAG2 = VAG.HEVAG2)
+            fixed (int* HEVAG3 = VAG.HEVAG3)
+            fixed (int* HEVAG4 = VAG.HEVAG4)
+            fixed (int* dataPtr = VAGData.Data)
+            {
+                c = HEVAG ? ch : 1;
+                int*  v1 = sampPtr;
+                int*  v2 = sampPtr + c;
+                int* tV1 = sampPtr + c * 2;
+                int* tV2 = sampPtr + c * 3;
+
+                for (i1 = 0; i1 < c; i1++)
+                {
+                     v1[i1] = 0;
+                     v2[i1] = 0;
+                    tV1[i1] = 0;
+                    tV2[i1] = 0;
+                }
+
+                if (HEVAG && PrNRCount > 29)
+                {
+                    int*  v3 = sampPtr + c * 4;
+                    int*  v4 = sampPtr + c * 5;
+                    int* tV3 = sampPtr + c * 6;
+                    int* tV4 = sampPtr + c * 7;
+
+                    for (i1 = 0; i1 < c; i1++)
+                    {
+                         v3[i1] = 0;
+                         v4[i1] = 0;
+                        tV3[i1] = 0;
+                        tV4[i1] = 0;
+                    }
+
+                    for (i1 = 0; i1 < VAGData.Size; i1++)
+                        for (c = 0; c < ch; c++)
+                        {
+                            for (i = 0, h = false; i < BS; i++)
+                            {
+                                dataBuf[i] = dataPtr[i1 * BS * ch + i * ch + c];
+                                if (dataBuf[i] != 0) h = true;
+                            }
+
+                            if (h)
+                            {
+                                Calc4BitsHEVAG(HEVAG1, HEVAG2, HEVAG3, HEVAG4, v1 + c, v2 + c,
+                                    v3 + c, v4 + c, tV1 + c, tV2 + c, tV3 + c, tV4 + c);
+
+                                s = ((PrNR & 0xF) << 4) | (ShF & 0xF);
+                                writer.W((byte)s);
+                                s = (PrNR & 0xF0) | (VAGData.Flags[i1] & 0xF);
+                                writer.W((byte)s);
+                                for (i = 0, i2 = 1; i < BS; i += 2, i2 += 2)
+                                {
+                                    s = ((fourBit[i2] & 0xF) << 4) | (fourBit[i] & 0xF);
+                                    writer.W((byte)s);
+                                }
+                            }
+                            else
+                            {
+                                 v1[c] = 0;  v2[c] = 0;  v3[c] = 0;  v4[c] = 0;
+                                tV1[c] = 0; tV2[c] = 0; tV3[c] = 0; tV4[c] = 0;
+                                s = (VAGData.Flags[i1] & 0xF) << 8;
+                                writer.W(s);
+                                writer.W(0);
+                                writer.W(0);
+                                writer.W(0);
+                            }
+                        }
+                }
+                else if (HEVAG)
+                    for (i1 = 0; i1 < VAGData.Size; i1++)
+                        for (c = 0; c < ch; c++)
+                        {
+                            for (i = 0, h = false; i < BS; i++)
+                            {
+                                dataBuf[i] = dataPtr[i1 * BS * ch + i * ch + c];
+                                if (dataBuf[i] != 0) h = true;
+                            }
+
+                            if (h)
+                            {
+                                Calc4BitsVAG(HEVAG1, HEVAG2, v1 + c, v2 + c, tV1 + c, tV2 + c);
+
+                                s = ((PrNR & 0xF) << 4) | (ShF & 0xF);
+                                writer.W((byte)s);
+                                s = (PrNR & 0xF0) | (VAGData.Flags[i1] & 0xF);
+                                writer.W((byte)s);
+                                for (i = 0, i2 = 1; i < BS; i += 2, i2 += 2)
+                                {
+                                    s = ((fourBit[i2] & 0xF) << 4) | (fourBit[i] & 0xF);
+                                    writer.W((byte)s);
+                                }
+                            }
+                            else
+                            {
+                                 v1[c] = 0;  v2[c] = 0;
+                                tV1[c] = 0; tV2[c] = 0;
+                                s = (VAGData.Flags[i1] & 0xF) << 8;
+                                writer.W(s);
+                                writer.W(0);
+                                writer.W(0);
+                                writer.W(0);
+                            }
+                        }
+                else
+                    for (i1 = 0; i1 < VAGData.Size; i1++)
+                    {
+                        for (i = 0, h = false; i < BS; i++)
+                        {
+                            for (c = 0, s = 0, dataBuf[i] = 0; c < ch; c++)
+                                dataBuf[i] += dataPtr[i1 * BS * ch + i * ch + c];
+                            dataBuf[i] /= ch;
+                            if (dataBuf[i] != 0) h = true;
+                        }
+
+                        if (h)
+                        {
+                            Calc4BitsVAG(HEVAG1, HEVAG2, v1, v2, tV1, tV2);
+
+                            s = ((PrNR & 0xF) << 4) | (ShF & 0xF);
+                            writer.W((byte)s);
+                            s = VAGData.Flags[i1] & 0xF;
+                            writer.W((byte)s);
+                            for (i = 0, i2 = 1; i < BS; i += 2, i2 += 2)
+                            {
+                                s = ((fourBit[i2] & 0xF) << 4) | (fourBit[i] & 0xF);
+                                writer.W((byte)s);
+                            }
+                        }
+                        else
+                        {
+                            * v1 = 0; * v2 = 0;
+                            *tV1 = 0; *tV2 = 0;
+                            s = (VAGData.Flags[i1] & 0xF) << 8;
+                            writer.W(s);
+                            writer.W(0);
+                            writer.W(0);
+                            writer.W(0);
+                        }
+                    }
+            }
+
+            if (!HEVAG) ch = 1;
+            for (c = 0; c < ch; c++)
+            {
+                writer.W(0x77770700);
+                writer.W(0x77777777);
+                writer.W(0x77777777);
+                writer.W(0x77777777);
+            }
+
+            if (writer.P % 0x20 > 0)
+            {
+                writer.W(0x10101010);
+                writer.W(0x10101010);
+                writer.W(0x10101010);
+                writer.W(0x10101010);
+            }
+            writer.C();
+        }
+
+        private fixed int dataBuf[(int)BS];
+        private fixed int fourBit[(int)BS];
+        private fixed int tempBuf[(int)BS];
+        private int err, max, min, ShM, s1, s2, s3, s4, tS1, tS2, tS3, tS4, PrNRf, ShFf;
+        private int HEVAG_1, HEVAG_2, HEVAG_3, HEVAG_4;
+
+        private void Calc4BitsVAG(int* HEVAG1, int* HEVAG2, int* v1, int* v2, int* tV1, int* tV2)
+        {
+            min = 0x7FFFFFFF;
+            PrNRf = 0;
+            for (j = 0; j < PrNRCount; j++)
+            {
+                PrNR = j;
+
+                Calc4Bits_VAG(HEVAG1, HEVAG2, v1, v2, tV1, tV2);
+
+                s1 = *v1; s2 = *v2;
+                err = 0;
+                for (i = 0; i < BS; i++)
+                {
+                    d0 = fourBit[i] << ShFf;
+
+                    g = ((s1 * HEVAG_1 + s2 * HEVAG_2) >> 5) + d0;
+                    s2 = s1; s1 = g >> 8;
+                    e = dataBuf[i] - g;
+                    g = e >> 31;
+                    err += (e + g) ^ g;
+                }
+
+                if (err < min) { PrNRf = j; min = err; }
+            }
+            PrNR = PrNRf;
+
+            Calc4Bits_VAG(HEVAG1, HEVAG2, v1, v2, tV1, tV2);
+            * v1 =  s1; * v2 =  s2;
+            *tV1 = tS1; *tV2 = tS2;
+        }
+
+        private void Calc4Bits_VAG(int* HEVAG1, int* HEVAG2, int* v1, int* v2, int* tV1, int* tV2)
+        {
+            s1 = *v1; s2 = *v2;
+            HEVAG_1 = HEVAG1[PrNR]; HEVAG_2 = HEVAG2[PrNR];
+
+            for (i = 0, max = 0; i < BS; i++)
+            {
+                g = dataBuf[i];
+                e = (s1 * HEVAG_1 + s2 * HEVAG_2) >> 5;
+                e = g - e;
+                s2 = s1; s1 = g >> 8;
+                     if (e >  0x77FFFF) e =  0x77FFFF;
+                else if (e < -0x780000) e = -0x780000;
+                tempBuf[i] = e;
+                g = e >> 31;
+                e = (e + g) ^ g;
+                if (e > max) max = e;
+            }
+
+            for (ShF = 12, ShM = 0x400000; ShF > 0; ShF--, ShM >>= 1)
+                if ((ShM & (max + (ShM >> 4))) == ShM) break;
+            ShFf = 8 + ShF;
+            ShF = 12 - ShF;
+
+            tS1 = *tV1; tS2 = *tV2;
+            for (i = 0; i < BS; i++)
+            {
+                g = tempBuf[i];
+                e = (tS1 * HEVAG_1 + tS2 * HEVAG_2) >> 5;
+                e = g - e;
+
+                d1 = e << ShF;
+                d0 = (d1 + 0x80000) >> 20;
+                     if (d0 >  7) d0 =  7;
+                else if (d0 < -8) d0 = -8;
+                fourBit[i] = d0;
+                d0 <<= ShFf;
+
+                tS2 = tS1; tS1 = (d0 - e) >> 8;
+            }
+        }
+
+        private void Calc4BitsHEVAG(int* HEVAG1, int* HEVAG2, int* HEVAG3, int* HEVAG4,
+            int* v1, int* v2, int* v3, int* v4, int* tV1, int* tV2, int* tV3, int* tV4)
+        {
+            min = 0x7FFFFFFF;
+            PrNRf = 0;
+            for (j = 0; j < PrNRCount; j++)
+            {
+                PrNR = j;
+
+                Calc4Bits_HEVAG(HEVAG1, HEVAG2, HEVAG3, HEVAG4, v1, v2, v3, v4, tV1, tV2, tV3, tV4);
+
+                s1 = *v1; s2 = *v2; s3 = *v3; s4 = *v4;
+                err = 0;
+                for (i = 0; i < BS; i++)
+                {
+                    d0 = fourBit[i] << ShFf;
+
+                    g = ((s1 * HEVAG_1 + s2 * HEVAG_2 + s3 * HEVAG_3 + s4 * HEVAG_4) >> 5) + d0;
+                    s4 = s3; s3 = s2; s2 = s1; s1 = g >> 8;
+                    e = dataBuf[i] - g;
+                    g = e >> 31;
+                    err += (e + g) ^ g;
+                }
+
+                if (err < min) { PrNRf = j; min = err; }
+            }
+            PrNR = PrNRf;
+
+            Calc4Bits_HEVAG(HEVAG1, HEVAG2, HEVAG3, HEVAG4, v1, v2, v3, v4, tV1, tV2, tV3, tV4);
+            * v1 =  s1; * v2 =  s2; * v3 =  s3; * v4 =  s4;
+            *tV1 = tS1; *tV2 = tS2; *tV3 = tS3; *tV4 = tS4;
+        }
+
+        private void Calc4Bits_HEVAG(int* HEVAG1, int* HEVAG2, int* HEVAG3, int* HEVAG4,
+            int* v1, int* v2, int* v3, int* v4, int* tV1, int* tV2, int* tV3, int* tV4)
+        {
+            s1 = *v1; s2 = *v2; s3 = *v3; s4 = *v4;
+            HEVAG_1 = HEVAG1[PrNR]; HEVAG_2 = HEVAG2[PrNR];
+            HEVAG_3 = HEVAG3[PrNR]; HEVAG_4 = HEVAG4[PrNR];
+
+            for (i = 0, max = 0; i < BS; i++)
+            {
+                g = dataBuf[i];
+                e = (s1 * HEVAG_1 + s2 * HEVAG_2 + s3 * HEVAG_3 + s4 * HEVAG_4) >> 5;
+                e = g - e;
+                s4 = s3; s3 = s2; s2 = s1; s1 = g >> 8;
+
+                     if (e >  0x77FFFF) e =  0x77FFFF;
+                else if (e < -0x780000) e = -0x780000;
+                tempBuf[i] = e;
+                g = e >> 31;
+                e = (e + g) ^ g;
+                if (e > max) max = e;
+            }
+
+            for (ShF = 12, ShM = 0x400000; ShF > 0; ShF--, ShM >>= 1)
+                if ((ShM & (max + (ShM >> 4))) == ShM) break;
+            ShFf = 8 + ShF;
+            ShF = 12 - ShF;
+
+            tS1 = *tV1; tS2 = *tV2; tS3 = *tV3; tS4 = *tV4;
+            for (i = 0; i < BS; i++)
+            {
+                g = tempBuf[i];
+                e = (tS1 * HEVAG_1 + tS2 * HEVAG_2 + tS3 * HEVAG_3 + tS4 * HEVAG_4) >> 5;
+                e = g - e;
+
+                d1 = e << ShF;
+                d0 = (d1 + 0x80000) >> 20;
+                     if (d0 >  7) d0 =  7;
+                else if (d0 < -8) d0 = -8;
+                fourBit[i] = d0;
+                d0 <<= ShFf;
+
+                tS4 = tS3; tS3 = tS2; tS2 = tS1; tS1 = (d0 - e) >> 8;
+            }
+        }
+
+        public int WAVReaderStraight(string file, bool ExtendedFlagging = false)
+        {
+            Success = false;
+            VAGData = new VAGFile();
+            Stream reader = File.OpenReader(file + ".wav");
+            WAV.Header Header = reader.ReadWAVHeader();
+            if (!Header.IsSupported) { reader.C(); return 1; }
+            ch = Header.Channels;
+            VBS = BS * ch;
+
+            VAGData.Size = Header.Size / Header.Bytes;
+            VAGData.Data = new int[VAGData.Size.A(VBS)];
+            fixed (int* dataPtr = VAGData.Data)
+            {
+                int* localDataPtr = dataPtr;
+                     if (Header.Bytes == 1 && Header.Format == 0x01)
+                    for (int i1 = 0; i1 < VAGData.Size; i1++, localDataPtr++)
+                        *localDataPtr =      (reader.RU8  () - 0x80) << 16;
+                else if (Header.Bytes == 2 && Header.Format == 0x01)
+                    for (int i1 = 0; i1 < VAGData.Size; i1++, localDataPtr++)
+                        *localDataPtr =       reader.RI16 () << 8;
+                else if (Header.Bytes == 3 && Header.Format == 0x01)
+                    for (int i1 = 0; i1 < VAGData.Size; i1++, localDataPtr++)
+                        *localDataPtr =       reader.RU8  () | (reader.RI16() << 8);
+                else if (Header.Bytes == 4 && Header.Format == 0x01)
+                    for (int i1 = 0; i1 < VAGData.Size; i1++, localDataPtr++)
+                        *localDataPtr =       reader.RI32 () >> 8;
+                else if (Header.Bytes == 4 && Header.Format == 0x03)
+                    for (int i1 = 0; i1 < VAGData.Size; i1++, localDataPtr++)
+                        *localDataPtr = (int)(reader.RF32() * 8388608.0);
+                else if (Header.Bytes == 8 && Header.Format == 0x03)
+                    for (int i1 = 0; i1 < VAGData.Size; i1++, localDataPtr++)
+                        *localDataPtr = (int)(reader.RF64() * 8388608.0);
+            }
+
+            VAGData.Size = VAGData.Size.A(VBS, VBS);
+            VAGData.Channels = ch;
+            VAGData.SampleRate = Header.SampleRate;
+            VAGData.Flags = new byte[VAGData.Size];
+            if (ExtendedFlagging) VAGData.Flags[0] = 0x4;
+            VAGData.Flags[VAGData.Size - 1] = 0x1;
+
+            reader.C();
+            Success = true;
+            return 0;
+        }
+
+        public int WAVReader(string file, bool ExtendedFlagging = false)
+        {
+            Success = false;
+            string[] Files;
+            bool HasLoop = false;
+            bool[] Loop;
+            {
+                if (!file.EndsWith(".0")) return WAVReaderStraight(file);
+                file = file.Remove(file.Length - 2);
+                i2 = 0;
+                System.Collections.Generic.List<string> files =
+                    new System.Collections.Generic.List<string>();
+                System.Collections.Generic.List<  bool>  loop =
+                    new System.Collections.Generic.List<  bool>();
+                while (true)
+                {
+                         if (File.Exists(file + "." + i2 +      ".wav"))
+                    { files.Add(file + "." + i2 +      ".wav"); loop.Add(false);                 }
+                    else if (File.Exists(file + "." + i2 + ".loop.wav"))
+                    { files.Add(file + "." + i2 + ".loop.wav"); loop.Add( true); HasLoop = true; }
+                    else break;
+                    i2++;
+                }
+                Files = files.ToArray();
+                Loop  = loop .ToArray();
+            }
+
+            int[] Sizes = new int[Files.Length];
+            ushort Channels = 0;
+            int AlignVAG, Size = 0, SampleRate = 0;
+
+            VAGData = new VAGFile();
+            Stream reader;
+            WAV.Header Header;
+            for (i = 0; i < Files.Length; i++)
+            {
+                reader = File.OpenReader(Files[i]);
+                Header = reader.ReadWAVHeader();
+
+                if (!Header.IsSupported) { reader.C(); return 2; }
+                if (i == 0) { SampleRate = Header.SampleRate;
+                    ch = Channels = Header.Channels; VBS = BS * ch; }
+                if (Header.Channels   != Channels  ) { reader.C(); return 3; }
+                if (Header.SampleRate != SampleRate) { reader.C(); return 4; }
+
+                Sizes[i] = Header.Size / Header.Bytes;
+                Size += Sizes[i].A(VBS);
+                reader.C();
+            }
+
+            VAGData.Size = Size / VBS;
+            VAGData.Data = new int[Size];
+            VAGData.Flags = new byte[VAGData.Size];
+
+            if (HasLoop)
+                for (i = 0; i < VAGData.Size; i++)
+                    VAGData.Flags[i] = 0x2;
+
+            i2 = 0;
+            int Start = 0, End = 0;
+            fixed (int* dataPtr = VAGData.Data)
+            {
+                int* localDataPtr = dataPtr;
+                for (i = 0; i < Files.Length; i++)
+                {
+                    reader = File.OpenReader(Files[i]);
+                    Header = reader.ReadWAVHeader();
+                         if (Header.Bytes == 1 && Header.Format == 0x01)
+                        for (int i1 = 0; i1 < Sizes[i]; i1++, localDataPtr++)
+                            *localDataPtr =      (reader.RU8  () - 0x80) << 16;
+                    else if (Header.Bytes == 2 && Header.Format == 0x01)
+                        for (int i1 = 0; i1 < Sizes[i]; i1++, localDataPtr++)
+                            *localDataPtr =       reader.RI16 () << 8;
+                    else if (Header.Bytes == 3 && Header.Format == 0x01)
+                        for (int i1 = 0; i1 < Sizes[i]; i1++, localDataPtr++)
+                            *localDataPtr =       reader.RU8  () | (reader.RI16() << 8);
+                    else if (Header.Bytes == 4 && Header.Format == 0x01)
+                        for (int i1 = 0; i1 < Sizes[i]; i1++, localDataPtr++)
+                            *localDataPtr =       reader.RI32 () >> 8;
+                    else if (Header.Bytes == 4 && Header.Format == 0x03)
+                        for (int i1 = 0; i1 < Sizes[i]; i1++, localDataPtr++)
+                            *localDataPtr = (int)(reader.RF32() * 8388608.0);
+                    else if (Header.Bytes == 8 && Header.Format == 0x03)
+                        for (int i1 = 0; i1 < Sizes[i]; i1++, localDataPtr++)
+                            *localDataPtr = (int)(reader.RF64() * 8388608.0);
+                    reader.C();
+
+                    AlignVAG = Sizes[i].A(VBS) - Sizes[i];
+                    localDataPtr += AlignVAG;
+
+                    AlignVAG = (Sizes[i] + AlignVAG) / VBS;
+                    End += AlignVAG;
+                    End--;
+                         if (Loop[i]         ) { VAGData.Flags[Start] = 0x6; VAGData.Flags[End] = 0x3; }
+                    else if (ExtendedFlagging)   VAGData.Flags[Start] = 0x4;
+                    if (i + 1 == Files.Length && !Loop[i]) VAGData.Flags[End] = 0x1;
+                    Start += AlignVAG;
+                    End++;
+                }
+            }
+
+            VAGData.Channels = ch;
+            VAGData.SampleRate = SampleRate;
+
+            Success = true;
+            return 0;
+        }
+
+        public void WAVWriterStraight(string file, bool IgnoreEndFlags = false)
+        {
+            if (!Success) return;
+            byte Flag = VAGData.Flags[0];
+            if (Flag == 7) return;
+            WAV.Header Header = new WAV.Header();
+            Stream writer = File.OpenWriter(file + ".wav", true);
+            writer.PI64 = 0x2C;
+
+            fixed (int* dataPtr = VAGData.Data)
+            {
+                int* localDataPtr = dataPtr;
+                if (Flag < 8)
+                    for (i = 0; i < BS; i++)
+                        for (c = 0; c < ch; c++)
+                        {
+                            f = (float)(localDataPtr[i * ch + c] / 8388608.0);
+                            writer.W(f);
+                        }
+                else
+                    for (i = 0; i < BS; i++)
+                        for (c = 0; c < ch; c++)
+                            writer.W(0f);
+
+                for (i1 = 0, i2 = 0; i1 < VAGData.Size; i1++, localDataPtr += VBS)
+                {
+                    Flag = VAGData.Flags[i1];
+                    if (!IgnoreEndFlags && (Flag == 5 || Flag == 7)) break;
+                    if (Flag < 8)
+                        for (i = 0; i < BS; i++)
+                            for (c = 0; c < ch; c++)
+                            {
+                                f = (float)(localDataPtr[i * ch + c] / 8388608.0);
+                                writer.W(f);
+                            }
+                    else
+                        for (i = 0; i < BS; i++)
+                            for (c = 0; c < ch; c++)
+                                writer.W(0f);
+
+                    if (!IgnoreEndFlags && Flag == 1) break;
+                }
+            }
+
+            Header = new WAV.Header { Bytes = 4, Channels = ch, Format = 3,
+                SampleRate = VAGData.SampleRate, Size = writer.P - 0x2C };
+            writer.W(Header, 0);
+            writer.C();
+        }
+
+        public void WAVWriter(string file, bool IgnoreEndFlags = false)
+        {
+            if (!Success) return;
+            byte Flag = VAGData.Flags[0];
+            if (Flag == 7) return;
+            WAV.Header Header = new WAV.Header();
+            Stream writer;
+            if (!IgnoreEndFlags && Flag == 6) writer = File.OpenWriter(file + ".loop.0.wav", true);
+            else                              writer = File.OpenWriter(file +      ".0.wav", true);
+            writer.PI64 = 0x2C;
+
+            fixed (int* dataPtr = VAGData.Data)
+            {
+                int* localDataPtr = dataPtr;
+                if (Flag < 8)
+                    for (i = 0; i < BS; i++)
+                        for (c = 0; c < ch; c++)
+                        {
+                            f = (float)(localDataPtr[i * ch + c] / 8388608.0);
+                            writer.W(f);
+                        }
+                else
+                    for (i = 0; i < BS; i++)
+                        for (c = 0; c < ch; c++)
+                            writer.W(0f);
+
+                localDataPtr += VBS;
+
+                for (i1 = 1, i2 = 0; i1 < VAGData.Size; i1++, localDataPtr += VBS)
+                {
+                    Flag = VAGData.Flags[i1];
+                    if (!IgnoreEndFlags && (Flag == 5 || Flag == 7)) break;
+                    else if (!IgnoreEndFlags && Flag == 6)
+                    {
+                        Header = new WAV.Header { Bytes = 4, Channels = ch, Format = 3,
+                            SampleRate = VAGData.SampleRate, Size = writer.P - 0x2C };
+                        writer.W(Header, 0);
+                        writer.C();
+                        i2++;
+
+                        writer = File.OpenWriter(file + "." + i2 + ".loop.wav", true);
+                        writer.PI64 = 0x2C;
+                    }
+
+                    if (!IgnoreEndFlags && Flag < 8)
+                        for (i = 0; i < BS; i++)
+                            for (c = 0; c < ch; c++)
+                            {
+                                f = (float)(localDataPtr[i * ch + c] / 8388608.0);
+                                writer.W(f);
+                            }
+                    else
+                        for (i = 0; i < BS; i++)
+                            for (c = 0; c < ch; c++)
+                                writer.W(0f);
+
+                         if (!IgnoreEndFlags && Flag == 1) break;
+                    else if (!IgnoreEndFlags && Flag == 3)
+                    {
+                        Header = new WAV.Header { Bytes = 4, Channels = ch, Format = 3,
+                            SampleRate = VAGData.SampleRate, Size = writer.P - 0x2C };
+                        writer.W(Header, 0);
+                        writer.C();
+                        i2++;
+
+                        writer = VAGData.Size == i1 + 1 ? File.OpenWriter()
+                            : File.OpenWriter(file + "." + i2 + ".wav", true);
+                        writer.PI64 = 0x2C;
+                    }
+                }
+            }
+
+            Header = new WAV.Header { Bytes = 4, Channels = ch, Format = 3,
+                SampleRate = VAGData.SampleRate, Size = writer.P - 0x2C };
+            writer.W(Header, 0);
+            writer.C();
+        }
+
+        public void Dispose() { VAGData = default; }
+
+        public struct VAGFile
+        {
+            public int Size;
+            public uint Version;
+            public int SampleRate;
+            public ushort Channels;
+            public fixed byte Name[10];
+            public byte[] Flags;
+            public int[] Data;
+        }
+
+        private static readonly int[] ShiftFactor =
+        { 0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1 };
+
+        private static readonly int[] HEVAG1 =
+        {
+                 0,   7680,  14720,  12544,  15616,  14731,  14507,  13920,
+             13133,  12028,  10764,   9359,   7832,   6201,   4488,   2717,
+               910,   -910,  -2717,  -4488,  -6201,  -7832,  -9359, -10764,
+            -12028, -13133, -13920, -14507, -14731,   5376,  -6400, -10496,
+              -167,  -7430,  -8001,   6018,   3798,  -8237,   9199,  13021,
+             13112,  -1668,   7819,   9571,  10032,  -4745,  -5896,  -1193,
+              2783,  -7334,   6127,   9457,   7876,  -7172,  -7358,  -9170,
+             -2638,   1873,   9214,  13204,  12437,  -2653,   9331,   1642,
+              4246,  -8988,  -2562,   3182,   7937,  10069,   8400,  -8529,
+              9477,     75,  -9143,  -7270,  -2740,   8993,  13101,   9543,
+              5272,  -7696,   7309,  10275,  10940,     24,  -8122,  -8511,
+               326,   8895,  12073,   8729,  12950,  10038,   9385,  -4720,
+              7869,   2450,  10192,  11313,  10154,   9638,   3854,   6699,
+             11082,  -1026,  10396,  10287,   7953,  12689,   6641,  -2348,
+              9290,   4633,  11247,   9807,   9736,   8440,   9307,   1698,
+             10214,   8390,   7201,    -88,   6193,  12325,  13064,   5333,
+        };
+
+        private static readonly int[] HEVAG2 =
+        {
+                0,     0, -6656, -7040, -7680, -7059, -7366, -7522,
+            -7680, -7680, -7680, -7680, -7680, -7680, -7680, -7680,
+            -7680, -7680, -7680, -7680, -7680, -7680, -7680, -7680,
+            -7680, -7680, -7522, -7366, -7059, -9216, -7168, -7424,
+            -2722, -2221, -3166, -4750, -6946, -2596,  1982, -3044,
+            -4487, -3744, -4328, -1336, -2562, -4122,  2378, -9117,
+            -7108, -2062, -2577, -1858, -4483, -1795, -2102, -3509,
+            -2647,  9183,  1859, -3012, -4792, -1144, -1048,  -620,
+            -7585, -3891, -2735,  -483, -3844, -2609, -3297, -2775,
+            -1882, -2241, -4160, -1958,  3745,  1948, -2835, -1961,
+            -4270, -3383,  2523, -2867, -3721,  -310, -2411, -3067,
+            -3846,  2194, -1876, -3423, -3847, -2570, -2757, -5006,
+            -4326, -8597, -2763, -4213, -2716, -1417, -4554, -5659,
+            -3908, -9810, -3746,   988,  3878, -3375,  3166, -7354,
+            -4039, -6403, -4125, -2284, -1536, -3436, -1021, -9025,
+            -2791,  3248,  3316, -7809, -5189, -1290, -4075,  2999,
+        };
+
+        private static readonly int[] HEVAG3 = new int[]
+        {
+                0,     0,     0,     0,     0,     0,     0,     0,
+                0,     0,     0,     0,     0,     0,     0,     0,
+                0,     0,     0,     0,     0,     0,     0,     0,
+                0,     0,     0,     0,     0,  3328, -3328, -3584,
+             -494, -2298, -2814,  2649,  3875, -2071, -1382, -3792,
+            -2250, -6456,  2111,  -757,   300, -5486, -4787, -1237,
+            -1575, -2212,  -315,   102,  2126, -2069, -2233, -2674,
+            -1929,  1860, -1124, -4139,  -256, -3182,  -828,  -946,
+             -533, -2807, -1730,  -714,  2821,   314,  1551, -2432,
+              108,  -298, -2963, -2156,  5936,  -683, -3854,   130,
+             3124, -2907,   434,   391,   665, -1262, -2311, -2337,
+              419,  -541, -2017,  1674, -3007,   302,  1008, -2852,
+             2135,  1299,   360,   833,   345,  -737,  2843,  2249,
+              728,  -805,  1367, -1915,  -764, -3354,   231, -1944,
+             1885,  1748,   802,   219,  -706,  1562,  -835,   688,
+              368,  -758,    46,  -538,  2760, -3284, -2824,   775,
+        };
+
+        private static readonly int[] HEVAG4 = new int[]
+        {
+                0,     0,     0,     0,     0,     0,     0,     0,
+                0,     0,     0,     0,     0,     0,     0,     0,
+                0,     0,     0,     0,     0,     0,     0,     0,
+                0,     0,     0,     0,     0, -3072, -2304, -1024,
+             -541,   424,   289, -1298, -1216,   227, -2316,  1267,
+             1665,   840,  -506,   487,   199, -1493, -6947, -3114,
+            -1447,   446,   -18,   258,  -538,   482,   440,  -391,
+            -1637, -5746, -2427,  1370,   622, -6878,   507, -4229,
+            -2259,    44, -1899, -1421, -1019,   195,  -155,  -336,
+              256, -6937,     5,   460, -1089, -2704,  1055,   250,
+            -3157,  -456, -2461,   172,    97,   320,  -271,   163,
+             -933, -2880,  -601,  -169,  1946,   198,    41, -1161,
+             -501, -2780,   181,    53,   185,   482, -3397, -1074,
+               80, -3462,   -96, -1437, -3263,  2079, -2089, -4122,
+             -246, -1619,    61,   222,   473,  -176,   509, -3037,
+              179, -2989, -2614, -4571, -1245,   253,  1877, -1132,
+        };
+    }
+}
diff --git a/PD_Tool/Properties/AssemblyInfo.cs b/PD_Tool/Properties/AssemblyInfo.cs
index 976162b..ad181ac 100644
--- a/PD_Tool/Properties/AssemblyInfo.cs
+++ b/PD_Tool/Properties/AssemblyInfo.cs
@@ -6,10 +6,10 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("PD_Tool")]
-[assembly: AssemblyCopyright("korenkonder (C) 2017-2023")]
+[assembly: AssemblyCopyright("korenkonder (C) 2017-2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("7B5D5A3A-A6F8-4813-C97D-ACFC98F7397E")]
-[assembly: AssemblyVersion("0.4.10.19")]
-[assembly: AssemblyFileVersion("0.4.10.19")]
+[assembly: AssemblyVersion("0.4.11.0")]
+[assembly: AssemblyFileVersion("0.4.11.0")]