diff --git a/Editor/resources/Shaders/ssao.shader b/Editor/resources/Shaders/ssao.shader
index 7a83e7d1..85a48f63 100644
--- a/Editor/resources/Shaders/ssao.shader
+++ b/Editor/resources/Shaders/ssao.shader
@@ -93,7 +93,7 @@ void main()
 {
     float depth = texture(u_Depth, UV).r ;
     vec3 fragPos = ViewPosFromDepth(depth);
-    
+    float normalizedRadius = u_Radius;
     if(depth > 0.9999999f)
     {
         FragColor = vec4(0, 0, 0, 0);
@@ -106,34 +106,31 @@ void main()
     normal = normalT.xyz;
     normal = normalize(normal);
     normal = goodNormal;
-    normal = normalT.xyz;
     vec3 randomVec = texture(u_Noise, UV * u_NoiseScale).xyz;  
-    float radius_depth = u_Radius/depth;
+    float radius_depth = normalizedRadius / depth;
     float occlusion = 0.0;
     vec3 position = vec3(UV, depth);
-
+    
     int skipped = 0;
+    float rangeCheckC = 0.0f;
     for(int i=0; i < 64; i++) 
     {
-        vec3 ray = radius_depth * reflect(u_Samples[i], randomVec);
-
-        /*
-        if(dot(normal, normalize(ray)) < u_Falloff)
-        {
-            skipped++;
-            continue;
-        }*/
-
+        vec3 ray = u_Radius * reflect(u_Samples[i], randomVec);
         vec3 hemi_ray = position + sign(dot(ray, normal)) * ray;
         
-        float occ_depth = texture(u_Depth, hemi_ray.xy).r;
-        float difference = depth - occ_depth + u_Bias;
-        float rangeCheck = smoothstep(0.0, 1.0, u_Radius * 10.0 / abs(depth - occ_depth));
-        //float rangeCheck = abs(depth - occ_depth) < u_Radius  ? 1.0 : 0.0;
-        occlusion += ( occ_depth <= hemi_ray.z - u_Bias ? 1.0 : 0.0) * rangeCheck;
+        float sampleDepth = texture(u_Depth, hemi_ray.xy).r;
+        float rangeCheck = smoothstep(0.0, 1.0, u_Radius * 0.8 / abs(depth - sampleDepth));
+        float ao = hemi_ray.z >= sampleDepth + u_Bias ? 1.0 : 0.0;
+        occlusion += ao * rangeCheck;
+        rangeCheckC += rangeCheck;
     }
   
-    float ao = 1.0 - u_Strength * occlusion * (1.0 / (64 ));
+    float ao = 1.0 - (occlusion / 64.0);
+    rangeCheckC /= 64.0;
 
-    FragColor = vec4(ao, ao, ao , 1.0);
+    float finalAO = pow(ao, u_Strength);
+    FragColor = vec4(finalAO, finalAO, finalAO, 1.0);
+    //FragColor = vec4(rangeCheckC, rangeCheckC, rangeCheckC, 1.0);
+
+    //FragColor = vec4(1.0, 1.0, 1.0, 1.0);
 }
\ No newline at end of file
diff --git a/Nuake/src/Rendering/PostFX/SSAO.h b/Nuake/src/Rendering/PostFX/SSAO.h
index f707b7a4..2dd6dece 100644
--- a/Nuake/src/Rendering/PostFX/SSAO.h
+++ b/Nuake/src/Rendering/PostFX/SSAO.h
@@ -27,11 +27,11 @@ namespace Nuake
 		}
 
 	public:
-		float Radius = 0.07f;
-		float Bias = 0.003f;
+		float Radius = 0.060f;
+		float Bias = 0.00125f;
 		float Area = 0.0075f;
 		float Falloff = 0.002f;
-		float Strength = 1.0f;
+		float Strength = 0.5f;
 		void Resize(const Vector2& size);
 		SSAO();
 		void Draw(FrameBuffer* gBuffer, const Matrix4& projection, const Matrix4& view);
diff --git a/Nuake/src/Rendering/SceneRenderer.cpp b/Nuake/src/Rendering/SceneRenderer.cpp
index a8d5dc2f..10143130 100644
--- a/Nuake/src/Rendering/SceneRenderer.cpp
+++ b/Nuake/src/Rendering/SceneRenderer.cpp
@@ -46,8 +46,7 @@ namespace Nuake {
 		mShadingBuffer->QueueResize(framebuffer.GetSize());
 		ShadingPass(scene);
 
-		auto& sceneEnv = scene.GetEnvironment();
-
+		const auto& sceneEnv = scene.GetEnvironment();
 		Texture* finalOutput = mShadingBuffer->GetTexture().get();
 		if (scene.GetEnvironment()->BloomEnabled)
 		{
@@ -57,9 +56,10 @@ namespace Nuake {
 
 			finalOutput = scene.GetEnvironment()->mBloom->GetOutput().get();
 		}
+		
 
-		auto view = scene.m_Registry.view<LightComponent>();
-		std::vector<LightComponent> lightList = std::vector<LightComponent>();
+		const auto view = scene.m_Registry.view<LightComponent>();
+		auto lightList = std::vector<LightComponent>();
 		for (auto l : view)
 		{
 			auto& lc = view.get<LightComponent>(l);
@@ -241,6 +241,8 @@ namespace Nuake {
 			Ref<Environment> environment = scene.GetEnvironment();
 			if (environment->CurrentSkyType == SkyType::ProceduralSky)
 			{
+				RenderCommand::Clear();
+				RenderCommand::SetClearColor(Color(0, 0, 0, 1));
 				environment->ProceduralSkybox->Draw(mProjection, mView);
 			}
 			else if (environment->CurrentSkyType == SkyType::ClearColor)