diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.cpp b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
index f11ec8f3f7..39a9d99458 100644
--- a/libraries/render-utils/src/AmbientOcclusionEffect.cpp
+++ b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
@@ -403,7 +403,7 @@ void AmbientOcclusionEffect::run(const render::SceneContextPointer& sceneContext
 
       
         // We need this with the mips levels  
-		batch.generateTextureMips(_framebuffer->getLinearDepthTexture());
+	//	batch.generateTextureMips(_framebuffer->getLinearDepthTexture());
         
         // Occlusion pass
         batch.setFramebuffer(occlusionFBO);
@@ -480,6 +480,10 @@ void DebugAmbientOcclusion::run(const render::SceneContextPointer& sceneContext,
     assert(renderContext->args);
     assert(renderContext->args->hasViewFrustum());
 
+	if (!_showCursorPixel) {
+		return;
+	}
+
     RenderArgs* args = renderContext->args;
 
     // FIXME: Different render modes should have different tasks
diff --git a/libraries/render-utils/src/DebugDeferredBuffer.cpp b/libraries/render-utils/src/DebugDeferredBuffer.cpp
index 86f97d57a6..c45ab8c0e2 100644
--- a/libraries/render-utils/src/DebugDeferredBuffer.cpp
+++ b/libraries/render-utils/src/DebugDeferredBuffer.cpp
@@ -403,22 +403,30 @@ void DebugDeferredBuffer::run(const SceneContextPointer& sceneContext, const Ren
 
         batch.setPipeline(getPipeline(_mode, first));
 
-        batch.setResourceTexture(Albedo, deferredFramebuffer->getDeferredColorTexture());
-        batch.setResourceTexture(Normal, deferredFramebuffer->getDeferredNormalTexture());
-        batch.setResourceTexture(Specular, deferredFramebuffer->getDeferredSpecularTexture());
-        batch.setResourceTexture(Depth, deferredFramebuffer->getPrimaryDepthTexture());
-        batch.setResourceTexture(Lighting, deferredFramebuffer->getLightingTexture());
-        batch.setResourceTexture(Shadow, lightStage.lights[0]->shadow.framebuffer->getDepthStencilBuffer());
-        batch.setResourceTexture(LinearDepth, linearDepthTarget->getLinearDepthTexture());
-        batch.setResourceTexture(HalfLinearDepth, linearDepthTarget->getHalfLinearDepthTexture());
-        batch.setResourceTexture(HalfNormal, linearDepthTarget->getHalfNormalTexture());
-
-        batch.setResourceTexture(Curvature, surfaceGeometryFramebuffer->getCurvatureTexture());
-        batch.setResourceTexture(DiffusedCurvature, surfaceGeometryFramebuffer->getLowCurvatureTexture());
-
-        batch.setResourceTexture(AmbientOcclusion, ambientOcclusionFramebuffer->getOcclusionTexture());
-        batch.setResourceTexture(AmbientOcclusionBlurred, ambientOcclusionFramebuffer->getOcclusionBlurredTexture());
+		if (deferredFramebuffer) {
+			batch.setResourceTexture(Albedo, deferredFramebuffer->getDeferredColorTexture());
+			batch.setResourceTexture(Normal, deferredFramebuffer->getDeferredNormalTexture());
+			batch.setResourceTexture(Specular, deferredFramebuffer->getDeferredSpecularTexture());
+			batch.setResourceTexture(Depth, deferredFramebuffer->getPrimaryDepthTexture());
+			batch.setResourceTexture(Lighting, deferredFramebuffer->getLightingTexture());
+		}
+		if (!lightStage.lights.empty()) {
+			batch.setResourceTexture(Shadow, lightStage.lights[0]->shadow.framebuffer->getDepthStencilBuffer());
+		}
 
+		if (linearDepthTarget) {
+			batch.setResourceTexture(LinearDepth, linearDepthTarget->getLinearDepthTexture());
+			batch.setResourceTexture(HalfLinearDepth, linearDepthTarget->getHalfLinearDepthTexture());
+			batch.setResourceTexture(HalfNormal, linearDepthTarget->getHalfNormalTexture());
+		}
+		if (surfaceGeometryFramebuffer) {
+			batch.setResourceTexture(Curvature, surfaceGeometryFramebuffer->getCurvatureTexture());
+			batch.setResourceTexture(DiffusedCurvature, surfaceGeometryFramebuffer->getLowCurvatureTexture());
+		}
+		if (ambientOcclusionFramebuffer) {
+			batch.setResourceTexture(AmbientOcclusion, ambientOcclusionFramebuffer->getOcclusionTexture());
+			batch.setResourceTexture(AmbientOcclusionBlurred, ambientOcclusionFramebuffer->getOcclusionBlurredTexture());
+		}
         const glm::vec4 color(1.0f, 1.0f, 1.0f, 1.0f);
         const glm::vec2 bottomLeft(_size.x, _size.y);
         const glm::vec2 topRight(_size.z, _size.w);
diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp
index 7ea81eb706..7be78890e9 100755
--- a/libraries/render-utils/src/RenderDeferredTask.cpp
+++ b/libraries/render-utils/src/RenderDeferredTask.cpp
@@ -124,9 +124,9 @@ RenderDeferredTask::RenderDeferredTask(CullFunctor cullFunctor) {
     const auto linearDepthPassInputs = LinearDepthPass::Inputs(deferredFrameTransform, deferredFramebuffer).hasVarying();
     const auto linearDepthPassOutputs = addJob<LinearDepthPass>("LinearDepth", linearDepthPassInputs);
     const auto linearDepthTarget = linearDepthPassOutputs.getN<LinearDepthPass::Outputs>(0);
-    const auto linearDepthTexture = linearDepthPassOutputs.getN<LinearDepthPass::Outputs>(2);
-    const auto halfLinearDepthTexture = linearDepthPassOutputs.getN<LinearDepthPass::Outputs>(3);
-    const auto halfNormalTexture = linearDepthPassOutputs.getN<LinearDepthPass::Outputs>(4);
+  //  const auto linearDepthTexture = linearDepthPassOutputs.getN<LinearDepthPass::Outputs>(2);
+   // const auto halfLinearDepthTexture = linearDepthPassOutputs.getN<LinearDepthPass::Outputs>(3);
+  //  const auto halfNormalTexture = linearDepthPassOutputs.getN<LinearDepthPass::Outputs>(4);
 
     
     // Curvature pass
diff --git a/libraries/render-utils/src/SurfaceGeometryPass.cpp b/libraries/render-utils/src/SurfaceGeometryPass.cpp
index 0f009990de..46158e30b3 100644
--- a/libraries/render-utils/src/SurfaceGeometryPass.cpp
+++ b/libraries/render-utils/src/SurfaceGeometryPass.cpp
@@ -61,6 +61,9 @@ void LinearDepthFramebuffer::updatePrimaryDepth(const gpu::TexturePointer& depth
 void LinearDepthFramebuffer::clear() {
     _linearDepthFramebuffer.reset();
     _linearDepthTexture.reset();
+	_downsampleFramebuffer.reset();
+	_halfLinearDepthTexture.reset();
+	_halfNormalTexture.reset();
 }
 
 void LinearDepthFramebuffer::allocate() {
@@ -79,7 +82,7 @@ void LinearDepthFramebuffer::allocate() {
     // For Downsampling:
     _halfLinearDepthTexture = gpu::TexturePointer(gpu::Texture::create2D(gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::RGB), _halfFrameSize.x, _halfFrameSize.y,
         gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_LINEAR_MIP_POINT)));
-	_halfLinearDepthTexture->autoGenerateMips(-1);
+	_halfLinearDepthTexture->autoGenerateMips(5);
 
     _halfNormalTexture = gpu::TexturePointer(gpu::Texture::create2D(gpu::Element(gpu::VEC3, gpu::NUINT8, gpu::RGB), _halfFrameSize.x, _halfFrameSize.y,
         gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_LINEAR_MIP_POINT)));
diff --git a/scripts/developer/utilities/render/ambientOcclusionPass.qml b/scripts/developer/utilities/render/ambientOcclusionPass.qml
index b6d54676e3..89883ab399 100644
--- a/scripts/developer/utilities/render/ambientOcclusionPass.qml
+++ b/scripts/developer/utilities/render/ambientOcclusionPass.qml
@@ -38,21 +38,34 @@ Column {
                 }
             }
         }
-
-        Column {
-            Repeater {
-                model: [
-                    "resolutionLevel:resolutionLevel",
-                    "ditheringEnabled:ditheringEnabled",
-                    "borderingEnabled:borderingEnabled",
-                    "fetchMipsEnabled:fetchMipsEnabled",
-                ]
-                CheckBox {
-                    text: qsTr(modelData.split(":")[0])
-                    checked: Render.getConfig("AmbientOcclusion")[modelData.split(":")[1]]
-                    onCheckedChanged: { Render.getConfig("AmbientOcclusion")[modelData.split(":")[1]] = checked }
+        Row{
+            Column {
+                Repeater {
+                    model: [
+                        "resolutionLevel:resolutionLevel",
+                        "ditheringEnabled:ditheringEnabled",
+                        "borderingEnabled:borderingEnabled",
+                        "fetchMipsEnabled:fetchMipsEnabled"
+                    ]
+                    CheckBox {
+                        text: qsTr(modelData.split(":")[0])
+                        checked: Render.getConfig("AmbientOcclusion")[modelData.split(":")[1]]
+                        onCheckedChanged: { Render.getConfig("AmbientOcclusion")[modelData.split(":")[1]] = checked }
+                    } 
                 }
             }
+            Column {
+                Repeater {
+                    model: [
+                       "debugEnabled:showCursorPixel"
+                    ]
+                    CheckBox {
+                        text: qsTr(modelData.split(":")[0])
+                        checked: Render.getConfig("DebugAmbientOcclusion")[modelData.split(":")[1]]
+                        onCheckedChanged: { Render.getConfig("DebugAmbientOcclusion")[modelData.split(":")[1]] = checked }
+                    } 
+                }
+            }    
         }
 
         PlotPerf {