diff --git a/Shaders/agriculture-ALS.frag b/Shaders/agriculture-ALS.frag
index 3f4ffc3ea..19fca60a6 100644
--- a/Shaders/agriculture-ALS.frag
+++ b/Shaders/agriculture-ALS.frag
@@ -85,21 +85,11 @@ float light_distance_fading(in float dist);
 float fog_backscatter(in float avisibility);
 
 vec3 rayleigh_out_shift(in vec3 color, in float outscatter);
+vec3 get_hazeColor(in float light_arg);
 vec3 searchlight();
 vec3 landing_light(in float offset);
 
 
-float light_func (in float x, in float a, in float b, in float c, in float d, in float e)
-{
-x = x - 0.5;
-
-// use the asymptotics to shorten computations
-if (x > 30.0) {return e;}
-if (x < -15.0) {return 0.0;}
-
-return e / pow((1.0 + a * exp(-b * (x-c)) ),(1.0/d));
-}
-
 
 // a fade function for procedural scales which are smaller than a pixel
 
@@ -458,12 +448,9 @@ if ((dist < 5000.0)&& (quality_level > 3) && (combined_wetness>0.0))
 
     fragColor = color * texel + specular;
 
-
-   vec3 hazeColor;
    float lightArg = (terminator-yprime_alt)/100000.0;
-   hazeColor.b = light_func(lightArg, 1.330e-05, 0.264, 2.527, 1.08e-05, 1.0);
-   hazeColor.g = light_func(lightArg, 3.931e-06, 0.264, 3.827, 7.93e-06, 1.0);
-   hazeColor.r = light_func(lightArg, 8.305e-06, 0.161, 3.827, 3.04e-05, 1.0);
+   vec3 hazeColor = get_hazeColor(lightArg);
+
 
 
 // Rayleigh color shift due to out-scattering
@@ -648,8 +635,15 @@ if (intensity > 0.0) // this needs to be a condition, because otherwise hazeColo
 	hazeColor = mix(shadow * hazeColor, hazeColor, 0.3 + 0.7* smoothstep(250000.0, 400000.0, terminator));
 	}
 
+// don't let the light fade out too rapidly
+lightArg = (terminator + 200000.0)/100000.0;
+float minLightIntensity = min(0.2,0.16 * lightArg + 0.5);
+vec3 minLight = minLightIntensity * vec3 (0.2, 0.3, 0.4);
 
-fragColor.rgb = mix((eqColorFactor * hazeColor * eShade) +secondary_light * fog_backscatter(avisibility), fragColor.rgb,transmission);
+hazeColor.rgb *= eqColorFactor * eShade;
+hazeColor.rgb = max(hazeColor.rgb, minLight.rgb);
+
+fragColor.rgb = mix(hazeColor  + secondary_light * fog_backscatter(avisibility), fragColor.rgb,transmission);
 
 }
 
diff --git a/Shaders/rock-ALS.frag b/Shaders/rock-ALS.frag
index 7e2d8a0ea..be68d7141 100644
--- a/Shaders/rock-ALS.frag
+++ b/Shaders/rock-ALS.frag
@@ -77,6 +77,7 @@ float light_distance_fading(in float dist);
 float fog_backscatter(in float avisibility);
 
 vec3 rayleigh_out_shift(in vec3 color, in float outscatter);
+vec3 get_hazeColor(in float light_arg);
 vec3 searchlight();
 vec3 landing_light(in float offset);
 
@@ -477,11 +478,9 @@ if ((dist < 5000.0) && (combined_wetness>0.0))
     fragColor = color * texel + specular;
 
 float lightArg = (terminator-yprime_alt)/100000.0;	
-vec3 hazeColor;
+vec3 hazeColor = get_hazeColor(lightArg);
+
 
-hazeColor.b = light_func(lightArg, 1.330e-05, 0.264, 2.527, 1.08e-05, 1.0);
-hazeColor.g = light_func(lightArg, 3.931e-06, 0.264, 3.827, 7.93e-06, 1.0);
-hazeColor.r = light_func(lightArg, 8.305e-06, 0.161, 3.827, 3.04e-05, 1.0);
 
 // Rayleigh color shift due to out-scattering
     float rayleigh_length = 0.5 * avisibility * (2.5 - 1.9 * air_pollution)/alt_factor(eye_alt, eye_alt+relPos.z);
@@ -651,10 +650,16 @@ if (intensity > 0.0) // this needs to be a condition, because otherwise hazeColo
 	hazeColor = mix(shadow * hazeColor, hazeColor, 0.3 + 0.7* smoothstep(250000.0, 400000.0, terminator));
 	}
 
+// don't let the light fade out too rapidly
+lightArg = (terminator + 200000.0)/100000.0;
+float minLightIntensity = min(0.2,0.16 * lightArg + 0.5);
+vec3 minLight = minLightIntensity * vec3 (0.2, 0.3, 0.4);
+
+hazeColor.rgb *= eqColorFactor * eShade;
+hazeColor.rgb = max(hazeColor.rgb, minLight.rgb);
 
 
-
-fragColor.rgb = mix(eqColorFactor * hazeColor * eShade , fragColor.rgb,transmission);
+fragColor.rgb = mix(hazeColor, fragColor.rgb,transmission);
 
 }
 
diff --git a/Shaders/tree-ALS.frag b/Shaders/tree-ALS.frag
index 0d32ece52..99f8867ec 100644
--- a/Shaders/tree-ALS.frag
+++ b/Shaders/tree-ALS.frag
@@ -47,27 +47,11 @@ float rayleigh_in_func(in float dist, in float air_pollution, in float avisibili
 
 vec3 searchlight();
 vec3 landing_light(in float offset);
-
-float luminance(vec3 color)
-{
-    return dot(vec3(0.212671, 0.715160, 0.072169), color);
-}
+vec3 get_hazeColor(in float light_arg);
 
 
-float light_func (in float x, in float a, in float b, in float c, in float d, in float e)
-{
-x = x - 0.5;
 
-// use the asymptotics to shorten computations
-if (x > 30.0) {return e;}
-if (x < -15.0) {return 0.0;}
 
-return e / pow((1.0 + a * exp(-b * (x-c)) ),(1.0/d));
-}
-
-// this determines how light is attenuated in the distance
-// physically this should be exp(-arg) but for technical reasons we use a sharper cutoff
-// for distance > visibility
 
 float tree_fog_func (in float targ)
 {
@@ -185,11 +169,9 @@ void main()
 
    float lightArg = (terminator-yprime_alt)/100000.0;
 
-    vec3 hazeColor;
+    vec3 hazeColor = get_hazeColor(lightArg);
 
-    hazeColor.b = light_func(lightArg, 1.330e-05, 0.264, 2.527, 1.08e-05, 1.0);
-    hazeColor.g = light_func(lightArg, 3.931e-06, 0.264, 3.827, 7.93e-06, 1.0);
-    hazeColor.r = light_func(lightArg, 8.305e-06, 0.161, 3.827, 3.04e-05, 1.0);
+  
 
 // Rayleigh color shift due to in-scattering
 
@@ -349,11 +331,18 @@ hazeColor = intensity * normalize(mix(hazeColor,  1.5* shadedFogColor, 1.0 -smoo
 hazeColor = intensity * normalize(mix(hazeColor,  shadedFogColor, (1.0-smoothstep(0.5,0.9,eqColorFactor)))); 
 
 
+// don't let the light fade out too rapidly
+lightArg = (terminator + 200000.0)/100000.0;
+float minLightIntensity = min(0.2,0.16 * lightArg + 0.5);
+vec3 minLight = minLightIntensity * vec3 (0.2, 0.3, 0.4);
+
+hazeColor.rgb *= eqColorFactor * eShade;
+hazeColor.rgb = max(hazeColor.rgb, minLight.rgb);
 
 // determine the right mix of transmission and haze
 
 hazeColor = clamp(hazeColor,0.0,1.0);
-fragColor.rgb = mix(eqColorFactor * hazeColor * eShade + secondary_light * fog_backscatter(avisibility), fragColor.rgb,transmission);
+fragColor.rgb = mix( hazeColor  + secondary_light * fog_backscatter(avisibility), fragColor.rgb,transmission);
 
 }