diff --git a/Assets/Shaders/ShinyHighlight_FS.glsl b/Assets/Shaders/ShinyHighlight_FS.glsl
index 511c0704..92020d9a 100644
--- a/Assets/Shaders/ShinyHighlight_FS.glsl
+++ b/Assets/Shaders/ShinyHighlight_FS.glsl
@@ -62,6 +62,11 @@ layout(location = 4) out vec4 albedo;
 layout(location = 5) out vec4 worldSpacePosition;
 layout(location = 6) out vec4 objectVFX;
 
+float map (float value, float srcLow, float srcHigh, float dstLow, float dstHigh)
+{
+  return dstLow + (value - srcLow) * (dstHigh - dstLow) / (srcHigh - srcLow);
+}
+
 void main()
 {
   position = In.vertPos;
@@ -72,13 +77,21 @@ void main()
   outEntityID = In2.eid;
   lightLayerIndices = In2.lightLayerIndex;
 
-  float vpHeight = float (In2.screenSpacePos.y);
-  float scanlineScale = 300.0f * (1.0f - In2.screenSpacePos.z);
+  float vpHeight = (float (In2.screenSpacePos.y) - (genericDataBuffer.data.elapsedTime * 4000.0f * (1.0f - In2.screenSpacePos.z)));
+  vpHeight = float (int (vpHeight) % genericDataBuffer.data.viewportHeight);
+  float scanlineScale = 2500.0f * (1.0f - In2.screenSpacePos.z);
 
   float lowerLimit = vpHeight - scanlineScale;
   float upperLimit = vpHeight + scanlineScale;
   if (gl_FragCoord.y > lowerLimit && gl_FragCoord.y < upperLimit)
-    objectVFX = vec4(1.0f);
+  {
+    float opacity = 0.0f;
+    opacity = map (abs (gl_FragCoord.y - vpHeight), 0.0f, upperLimit - vpHeight, 0.0f, 1.0f);
+    opacity = 1.0f - clamp (opacity, 0.0f, 1.0f);
+
+
+    objectVFX = vec4(opacity);
+  }
   else
     objectVFX = vec4(0.0f, 0.0f, 0.0f, 1.0f);
 }
\ No newline at end of file
diff --git a/Assets/Shaders/ShinyHighlight_FS.shshaderb b/Assets/Shaders/ShinyHighlight_FS.shshaderb
index fea73931..af550ffe 100644
Binary files a/Assets/Shaders/ShinyHighlight_FS.shshaderb and b/Assets/Shaders/ShinyHighlight_FS.shshaderb differ
diff --git a/SHADE_Engine/src/Graphics/Pipeline/SHVkPipelineLayout.cpp b/SHADE_Engine/src/Graphics/Pipeline/SHVkPipelineLayout.cpp
index e08be902..fa9bf6bf 100644
--- a/SHADE_Engine/src/Graphics/Pipeline/SHVkPipelineLayout.cpp
+++ b/SHADE_Engine/src/Graphics/Pipeline/SHVkPipelineLayout.cpp
@@ -298,6 +298,10 @@ namespace SHADE
 
     descriptorSetLayoutsAllocate.clear();
     
+    dynamicBufferBindings.clear();
+
+    descriptorSetLayoutsPipeline.clear();
+
     // We don't need to use vulkan to destroy descriptor sets here since they are just owned by the container with handles
     vkDescriptorSetLayoutsAllocate.clear();
     vkDescriptorSetLayoutsPipeline.clear();