diff --git a/include/Engine/Rendering/Skeleton.h b/include/Engine/Rendering/Skeleton.h
index 3711c8b2..d14ab4ae 100644
--- a/include/Engine/Rendering/Skeleton.h
+++ b/include/Engine/Rendering/Skeleton.h
@@ -20,11 +20,14 @@ public:
 			, Parent(parent)
 			, Name(name)
 			, OffsetMatrix(offsetMatrix)
-		{ }
+		{
+			BindTransformMatrix = glm::inverse(offsetMatrix);
+		}
 
 		std::string Name;
 		glm::mat4 OffsetMatrix;
         int ID;
+		glm::mat4 BindTransformMatrix;
 
 		Bone* Parent;
 		std::vector<Bone*> Children;
diff --git a/resources/Shaders/ForwardPlusSkinned.vert.glsl b/resources/Shaders/ForwardPlusSkinned.vert.glsl
index 0a64c124..427e33ba 100644
--- a/resources/Shaders/ForwardPlusSkinned.vert.glsl
+++ b/resources/Shaders/ForwardPlusSkinned.vert.glsl
@@ -36,12 +36,10 @@ void main()
 {
 	mat4 boneTransform = mat4(1);
 
-	if(BoneWeights[0] > 0.0f){ 
 	boneTransform = BoneWeights[0] * Bones[int(BoneIndices[0])]
 				  + BoneWeights[1] * Bones[int(BoneIndices[1])]
 				  + BoneWeights[2] * Bones[int(BoneIndices[2])]
 				  + BoneWeights[3] * Bones[int(BoneIndices[3])];
-	}
 
 	gl_Position = PVM*boneTransform * vec4(Position, 1.0);
 	
diff --git a/resources/Shaders/PickingSkinned.vert.glsl b/resources/Shaders/PickingSkinned.vert.glsl
index 4d72fa49..44061e64 100644
--- a/resources/Shaders/PickingSkinned.vert.glsl
+++ b/resources/Shaders/PickingSkinned.vert.glsl
@@ -17,12 +17,10 @@ out VertexData{
 void main()
 {
 	mat4 boneTransform = mat4(1);
-	if(BoneWeights[0] > 0.0f){
 	boneTransform = BoneWeights[0] * Bones[int(BoneIndices[0])]
 				  + BoneWeights[1] * Bones[int(BoneIndices[1])]
 				  + BoneWeights[2] * Bones[int(BoneIndices[2])]
 				  + BoneWeights[3] * Bones[int(BoneIndices[3])];
-	}
 
 	gl_Position = PVM*boneTransform * vec4(Position, 1.0);
 	Output.Position = (boneTransform * vec4(Position, 1.0)).xyz;
diff --git a/resources/Shaders/ShadowSkinned.vert.glsl b/resources/Shaders/ShadowSkinned.vert.glsl
index d627e2e6..ce20aec2 100644
--- a/resources/Shaders/ShadowSkinned.vert.glsl
+++ b/resources/Shaders/ShadowSkinned.vert.glsl
@@ -15,12 +15,10 @@ out VertexData{
 void main()
 {	
 	mat4 boneTransform = mat4(1);
-	if(BoneWeights[0] > 0.0f){
 	boneTransform = BoneWeights[0] * Bones[int(BoneIndices[0])]
 				  + BoneWeights[1] * Bones[int(BoneIndices[1])]
 				  + BoneWeights[2] * Bones[int(BoneIndices[2])]
 				  + BoneWeights[3] * Bones[int(BoneIndices[3])];
-	}
 
 	gl_Position = PVM * boneTransform * vec4(Position, 1.0);
 	Output.TextureCoordinate = TextureCoords;
diff --git a/src/Engine/Rendering/Skeleton.cpp b/src/Engine/Rendering/Skeleton.cpp
index 2883c53d..eb6a130d 100644
--- a/src/Engine/Rendering/Skeleton.cpp
+++ b/src/Engine/Rendering/Skeleton.cpp
@@ -33,33 +33,33 @@ void Skeleton::AccumulateBoneTransforms(bool noRootMotion, const Animation* anim
     PoseData poseData;
     
     if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
-        std::vector<Animation::Keyframe> boneKeyFrames = animation->JointAnimations.at(bone->ID);
+        const std::vector<Animation::Keyframe>& boneKeyFrames = animation->JointAnimations.at(bone->ID);
 
-        Animation::Keyframe currentFrame;
-        Animation::Keyframe nextFrame;
+        const Animation::Keyframe* currentFrame;
+        const Animation::Keyframe* nextFrame;
 
         if (boneKeyFrames.size() > 1) { // 2+ keyframes for the current bone
             for (int index = boneKeyFrames.size()-1; index >= 0; index--) { // find the bone keyframes that surrounds the current frame
                 if (time >= boneKeyFrames.at(index).Time) {
-                    currentFrame = boneKeyFrames.at(index);
-                    nextFrame = boneKeyFrames.at((index + 1) % boneKeyFrames.size());
+                    currentFrame = &boneKeyFrames.at(index);
+                    nextFrame = &boneKeyFrames.at((index + 1) % boneKeyFrames.size());
                     break;
                 }
             }
 
             float progress;
 
-            if (nextFrame.Index == 0) {
+            if (nextFrame->Index == 0) {
                 nextFrame = currentFrame;
-                progress = (time - currentFrame.Time) / (animation->Duration - currentFrame.Time);
+                progress = (time - currentFrame->Time) / (animation->Duration - currentFrame->Time);
             } else {
-                progress = (time - currentFrame.Time) / (nextFrame.Time - currentFrame.Time);
+                progress = (time - currentFrame->Time) / (nextFrame->Time - currentFrame->Time);
 
             }
 
             progress = glm::clamp(progress, 0.0f, 1.0f);
-            Animation::Keyframe::BoneProperty currentBoneProperty = currentFrame.BoneProperties;
-            Animation::Keyframe::BoneProperty nextBoneProperty = nextFrame.BoneProperties;
+            const Animation::Keyframe::BoneProperty& currentBoneProperty = currentFrame->BoneProperties;
+			const Animation::Keyframe::BoneProperty& nextBoneProperty = nextFrame->BoneProperties;
 
             glm::vec3 position = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
             glm::quat rotation = glm::normalize(glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress));
@@ -77,10 +77,10 @@ void Skeleton::AccumulateBoneTransforms(bool noRootMotion, const Animation* anim
             boneMatrices[bone->ID] = poseData;
 
         } else { // 1 keyframes for the current bone
-            currentFrame = boneKeyFrames.at(0);
-            poseData.Translation = currentFrame.BoneProperties.Position;
-            poseData.Orientation = currentFrame.BoneProperties.Rotation;
-            poseData.Scale = currentFrame.BoneProperties.Scale;
+            currentFrame = &boneKeyFrames.at(0);
+            poseData.Translation = currentFrame->BoneProperties.Position;
+            poseData.Orientation = currentFrame->BoneProperties.Rotation;
+            poseData.Scale = currentFrame->BoneProperties.Scale;
             boneMatrices[bone->ID] = poseData;
         }
     }
@@ -117,33 +117,33 @@ Skeleton::PoseData Skeleton::GetAdditiveBonePose(const Bone* bone, const Animati
     glm::vec3 scale = glm::vec3(1);
 
     if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
-        std::vector<Animation::Keyframe> boneKeyFrames = animation->JointAnimations.at(bone->ID);
+        const std::vector<Animation::Keyframe>& boneKeyFrames = animation->JointAnimations.at(bone->ID);
 
-        Animation::Keyframe currentFrame;
-        Animation::Keyframe nextFrame;
+        const Animation::Keyframe* currentFrame;
+        const Animation::Keyframe* nextFrame;
 
         if (boneKeyFrames.size() > 1) { // 2+ keyframes for the current bone
             for (int index = boneKeyFrames.size()-1; index >= 0; index--) { // find the bone keyframes that surrounds the current frame
                 if (time >= boneKeyFrames.at(index).Time) {
-                    currentFrame = boneKeyFrames.at(index);
-                    nextFrame = boneKeyFrames.at((index + 1) % boneKeyFrames.size());
+                    currentFrame = &boneKeyFrames.at(index);
+                    nextFrame = &boneKeyFrames.at((index + 1) % boneKeyFrames.size());
                     break;
                 }
             }
 
             float progress;
 
-            if (nextFrame.Index == 0) {
+            if (nextFrame->Index == 0) {
                 nextFrame = currentFrame;
-                progress = (time - currentFrame.Time) / (animation->Duration - currentFrame.Time);
+                progress = (time - currentFrame->Time) / (animation->Duration - currentFrame->Time);
             } else {
-                progress = (time - currentFrame.Time) / (nextFrame.Time - currentFrame.Time);
+                progress = (time - currentFrame->Time) / (nextFrame->Time - currentFrame->Time);
             }
 
             progress = glm::clamp(progress, 0.0f, 1.0f);
             
-            Animation::Keyframe::BoneProperty currentBoneProperty = currentFrame.BoneProperties;
-            Animation::Keyframe::BoneProperty nextBoneProperty = nextFrame.BoneProperties;
+            const Animation::Keyframe::BoneProperty& currentBoneProperty = currentFrame->BoneProperties;
+            const Animation::Keyframe::BoneProperty& nextBoneProperty = nextFrame->BoneProperties;
 
             position = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
             rotation = glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress);
@@ -151,10 +151,10 @@ Skeleton::PoseData Skeleton::GetAdditiveBonePose(const Bone* bone, const Animati
 
 
         } else { // 1 keyframes for the current bone
-            currentFrame = boneKeyFrames.at(0);
-            position = currentFrame.BoneProperties.Position;
-            rotation = currentFrame.BoneProperties.Rotation;
-            scale = currentFrame.BoneProperties.Scale;
+            currentFrame = &boneKeyFrames.at(0);
+            position = currentFrame->BoneProperties.Position;
+            rotation = currentFrame->BoneProperties.Rotation;
+            scale = currentFrame->BoneProperties.Scale;
         }
     }
 
@@ -270,10 +270,10 @@ void Skeleton::AccumulateFinalPose(std::map<int, glm::mat4>& boneMatrices, std::
         boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
     } else {
         if (bone->Parent) {
-            boneMatrix = parentMatrix * (glm::inverse(bone->OffsetMatrix) * bone->Parent->OffsetMatrix);
+            boneMatrix = parentMatrix * bone->BindTransformMatrix * bone->Parent->OffsetMatrix;
             boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
         } else {
-            boneMatrix = glm::inverse(bone->OffsetMatrix);
+            boneMatrix = bone->BindTransformMatrix;
             boneMatrices[bone->ID] = parentMatrix;
         }
     }