diff --git a/Assets/Application.SHConfig b/Assets/Application.SHConfig
index 370665d2..97477f5a 100644
--- a/Assets/Application.SHConfig
+++ b/Assets/Application.SHConfig
@@ -1,4 +1,4 @@
 Start in Fullscreen: false
-Starting Scene ID: 86098106
+Starting Scene ID: 91478134
 Window Size: {x: 1920, y: 1080}
 Window Title: SHADE Engine
\ No newline at end of file
diff --git a/Assets/Materials/default_racoon.shmat b/Assets/Materials/default_racoon.shmat
new file mode 100644
index 00000000..c1bb43c5
--- /dev/null
+++ b/Assets/Materials/default_racoon.shmat
@@ -0,0 +1,8 @@
+- VertexShader: 39210065
+  FragmentShader: 46377769
+  SubPass: G-Buffer Write
+  Properties:
+    data.color: {x: 1, y: 1, z: 1, w: 1}
+    data.textureIndex: 64651793
+    data.alpha: 0
+    data.beta: {x: 1, y: 1, z: 1}
\ No newline at end of file
diff --git a/Assets/Materials/default_racoon.shmat.shmeta b/Assets/Materials/default_racoon.shmat.shmeta
new file mode 100644
index 00000000..72d64811
--- /dev/null
+++ b/Assets/Materials/default_racoon.shmat.shmeta
@@ -0,0 +1,3 @@
+Name: default_racoon
+ID: 125722190
+Type: 7
diff --git a/Assets/Models/MD_RigTest01_SkinningTest.shmodel b/Assets/Models/MD_RigTest01_SkinningTest.shmodel
index b484cc31..0f11024c 100644
Binary files a/Assets/Models/MD_RigTest01_SkinningTest.shmodel and b/Assets/Models/MD_RigTest01_SkinningTest.shmodel differ
diff --git a/Assets/Models/MD_RigTest02_HierachyTest1.shmodel b/Assets/Models/MD_RigTest02_HierachyTest1.shmodel
index 2e6321b2..b64bc4c0 100644
Binary files a/Assets/Models/MD_RigTest02_HierachyTest1.shmodel and b/Assets/Models/MD_RigTest02_HierachyTest1.shmodel differ
diff --git a/Assets/Models/MD_RigTest04_BakedIKLegTest.shmodel b/Assets/Models/MD_RigTest04_BakedIKLegTest.shmodel
index 9443ea3d..a008e003 100644
Binary files a/Assets/Models/MD_RigTest04_BakedIKLegTest.shmodel and b/Assets/Models/MD_RigTest04_BakedIKLegTest.shmodel differ
diff --git a/Assets/Models/MD_RigTest06_Piston.shmodel b/Assets/Models/MD_RigTest06_Piston.shmodel
index afc3a393..9d368d8c 100644
Binary files a/Assets/Models/MD_RigTest06_Piston.shmodel and b/Assets/Models/MD_RigTest06_Piston.shmodel differ
diff --git a/Assets/Models/racoon.shmodel b/Assets/Models/racoon.shmodel
index 816f6057..08d89bb1 100644
Binary files a/Assets/Models/racoon.shmodel and b/Assets/Models/racoon.shmodel differ
diff --git a/Assets/Scenes/anim.shade b/Assets/Scenes/anim.shade
new file mode 100644
index 00000000..98206f0e
--- /dev/null
+++ b/Assets/Scenes/anim.shade
@@ -0,0 +1,33 @@
+- EID: 0
+  Name: Default
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Light Component:
+      Position: {x: 0, y: 0, z: 0}
+      Type: Directional
+      Direction: {x: 0, y: 0, z: 1}
+      Color: {x: 1, y: 1, z: 1, w: 1}
+      Layer: 4294967295
+      Strength: 0
+      IsActive: true
+  Scripts: ~
+- EID: 1
+  Name: Default
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 149723808
+      Material: 128805346
+      IsActive: true
+    Animator Component:
+      Rig: 80728853
+      Clip: 80728853
+      IsActive: true
+  Scripts: ~
\ No newline at end of file
diff --git a/Assets/Scenes/anim.shade.shmeta b/Assets/Scenes/anim.shade.shmeta
new file mode 100644
index 00000000..b4f63d2e
--- /dev/null
+++ b/Assets/Scenes/anim.shade.shmeta
@@ -0,0 +1,3 @@
+Name: anim
+ID: 91478134
+Type: 5
diff --git a/SHADE_Engine/src/Animation/SHAnimatorComponent.cpp b/SHADE_Engine/src/Animation/SHAnimatorComponent.cpp
index 1d17244c..518f87fb 100644
--- a/SHADE_Engine/src/Animation/SHAnimatorComponent.cpp
+++ b/SHADE_Engine/src/Animation/SHAnimatorComponent.cpp
@@ -135,7 +135,7 @@ namespace SHADE
     const int BONE_IDX = rig->GetNodeIndex(node);
     SHMatrix transformMatrix = node->TransformMatrix;
     const auto& CHANNELS = currClip->GetChannels();
-    if (CHANNELS.size() < BONE_IDX)
+    if (BONE_IDX < CHANNELS.size())
     {
       const auto& CHANNEL = CHANNELS[BONE_IDX];
       transformMatrix = SHMatrix::Transform
diff --git a/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp b/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp
index bdccf55e..7e5ed0c7 100644
--- a/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp
+++ b/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp
@@ -180,7 +180,7 @@ namespace SHADE
 
       SHVec3 scale{ SHVec3::One }, translation{ SHVec3::Zero };
       SHVec4 rotation{ SHVec4::UnitW };
-      SHMatrix matrix{ SHMatrix::Identity };
+      //SHMatrix matrix{ SHMatrix::Identity };
       std::vector<double> carrier;
 
       if (flag & NODE_DATA_ROTATION)
@@ -213,17 +213,18 @@ namespace SHADE
         translation = GetVec3FromVector(carrier);
       }
 
-      if (flag & NODE_DATA_MATRIX)
-      {
-        carrier.resize(NODE_COMPONENT_COUNT_MATRIX);
-        file.read(
-          reinterpret_cast<char*>(carrier.data()),
-          sizeof(double) * NODE_COMPONENT_COUNT_MATRIX
-        );
-        matrix = GetMatrixFromVector(carrier);
-      }
+      //if (flag & NODE_DATA_MATRIX)
+      //{
+      //  carrier.resize(NODE_COMPONENT_COUNT_MATRIX);
+      //  file.read(
+      //    reinterpret_cast<char*>(carrier.data()),
+      //    sizeof(double) * NODE_COMPONENT_COUNT_MATRIX
+      //  );
+      //  matrix = GetMatrixFromVector(carrier);
+      //}
 
-      auto result{ SHMatrix::Transform(translation, rotation, scale) };
+      auto const result = SHMatrix::Transform(translation, rotation, scale);
+      node.transform = result;
     }
   }