diff --git a/resources/Shaders/ForwardPlus.frag.glsl b/resources/Shaders/ForwardPlus.frag.glsl
index d1c75cd0..fc7527be 100644
--- a/resources/Shaders/ForwardPlus.frag.glsl
+++ b/resources/Shaders/ForwardPlus.frag.glsl
@@ -2,6 +2,7 @@
 
 #define MAX_SPLITS 4
 #define MIN_AMBIENT_LIGHT 0.3
+#define SHADOW_STRENGTH 0.3 //Should be ambient
 
 uniform mat4 M;
 uniform mat4 V;
@@ -235,7 +236,7 @@ float CalcShadowValue(vec4 light_space_pos, vec3 normal, vec3 light_dir, sampler
 	//shadowMapDepth = PoissonDotShadow(depth_texture_array, projCoords, layer_index, 4, 25.0 * FarDistance[MAX_SPLITS - 1]);
 	shadowMapDepth = SoftwarePCF(depth_texture_array, projCoords, layer_index, bias);
 
-    return 1.0 - shadowMapDepth;
+    return shadowMapDepth;
 } 
 
 int getShadowIndex(float far_distance[1])
@@ -342,8 +343,8 @@ void main()
 		totalLighting.Specular += vec4(light_result.Specular.rgb * ao, light_result.Specular.a);
 	}
 
-	totalLighting.Diffuse *= (1.5 + vec4(AmbientColor.rgba)) - vec4(vec3(shadowFactor), 0.0); 
-	totalLighting.Specular *= (1.5 + vec4(AmbientColor.rgba)) - vec4(vec3(shadowFactor), 0.0);
+	totalLighting.Diffuse *= vec4(min(vec3(shadowFactor) + AmbientColor.xyz, vec3(1.0)), 1.0);
+	totalLighting.Specular *= vec4(min(vec3(shadowFactor) + AmbientColor.xyz, vec3(1.0)), 1.0);
 	
 	//LightResult getInformation;
 	
diff --git a/resources/Shaders/ForwardPlus.vert.glsl b/resources/Shaders/ForwardPlus.vert.glsl
index b8d42b14..2a54415b 100644
--- a/resources/Shaders/ForwardPlus.vert.glsl
+++ b/resources/Shaders/ForwardPlus.vert.glsl
@@ -25,14 +25,6 @@ out VertexData{
 	vec4 PositionLightSpace[MAX_SPLITS];
 }Output;
 
-// N
-mat4 biasMatrix = mat4(
-vec4(0.5, 0.0, 0.0, 0.0),
-vec4(0.0, 0.5, 0.0, 0.0),
-vec4(0.0, 0.0, 0.5, 0.0),
-vec4(0.5, 0.5, 0.5, 1.0)
-);
-
 void main()
 {
 	gl_Position = P*V*M * vec4(Position, 1.0);
diff --git a/src/Engine/Rendering/DrawFinalPass.cpp b/src/Engine/Rendering/DrawFinalPass.cpp
index 11249703..4470ad1b 100644
--- a/src/Engine/Rendering/DrawFinalPass.cpp
+++ b/src/Engine/Rendering/DrawFinalPass.cpp
@@ -1014,6 +1014,14 @@ void DrawFinalPass::BindModelTextures(GLuint shaderHandle, std::shared_ptr<Model
 				glBindTexture(GL_TEXTURE_2D, m_BlackTexture->m_Texture);
 				glUniform2fv(glGetUniformLocation(shaderHandle, "GlowUVRepeat"), 1, glm::value_ptr(glm::vec2(1.0f, 1.0f)));
 			}
+
+			glActiveTexture(GL_TEXTURE6);
+			if (m_ShadowPass->DepthMap() != NULL) {
+				glBindTexture(GL_TEXTURE_2D_ARRAY, m_ShadowPass->DepthMap());
+			}
+			else {
+				glBindTexture(GL_TEXTURE_2D_ARRAY, m_WhiteTexture->m_Texture);
+			}
 			break;
 		}
 		case RawModel::MaterialType::SplatMapping:
@@ -1081,15 +1089,5 @@ void DrawFinalPass::BindModelTextures(GLuint shaderHandle, std::shared_ptr<Model
 			break;
 		}
 	}
-
-	glActiveTexture(GL_TEXTURE4);
-	if (m_ShadowPass->DepthMap() != NULL) {
-		glBindTexture(GL_TEXTURE_2D_ARRAY, m_ShadowPass->DepthMap());
-	}
-	else {
-		glBindTexture(GL_TEXTURE_2D_ARRAY, m_WhiteTexture->m_Texture);
-	}
-
-
 }
 
diff --git a/src/Engine/Rendering/ShadowPass.cpp b/src/Engine/Rendering/ShadowPass.cpp
index df0da0e1..0fa2193a 100644
--- a/src/Engine/Rendering/ShadowPass.cpp
+++ b/src/Engine/Rendering/ShadowPass.cpp
@@ -253,8 +253,8 @@ void ShadowPass::Draw(RenderScene & scene)
 
 						glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
 						glUniform1f(glGetUniformLocation(shaderHandle, "Alpha"), modelJob->Color.a);
-						
-						switch (modelJob->Type) {
+
+						/*switch (modelJob->Type) {
 						case RawModel::MaterialType::SingleTextures:
 						case RawModel::MaterialType::Basic:
 						{
@@ -275,7 +275,7 @@ void ShadowPass::Draw(RenderScene & scene)
 							glUniform2fv(glGetUniformLocation(shaderHandle, "DiffuseUVRepeat"), 1, glm::value_ptr(glm::vec2(1.0f, 1.0f)));
 							break;
 						}
-						}
+						}*/
 
 						glBindVertexArray(modelJob->Model->VAO);
 						glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);