diff --git a/Effects/bowwave.eff b/Effects/bowwave.eff
index 7af277295..e6abff1b1 100644
--- a/Effects/bowwave.eff
+++ b/Effects/bowwave.eff
@@ -202,6 +202,10 @@
 					<use>texture[0]/internal-format</use>
 				</internal-format>
 			</texture-unit>
+			<texture-unit>
+				<unit>1</unit>
+				<type>noise</type>
+			</texture-unit>
 			<texture-unit>
 				<unit>2</unit>
 				<image>
@@ -310,10 +314,7 @@
 					<use>texture[7]/internal-format</use>
 				</internal-format>
 			</texture-unit>
-			<texture-unit>
-				<unit>9</unit>
-				<type>noise</type>
-			</texture-unit>
+
 			<program>
 				<vertex-shader>Shaders/include_fog.vert</vertex-shader>
 				<vertex-shader>Shaders/wake.vert</vertex-shader>
@@ -442,7 +443,7 @@
 			<uniform>
 				<name>Noise</name>
 				<type>sampler-3d</type>
-				<value type="int">9</value>
+				<value type="int">1</value>
 			</uniform>
 			
 			<!-- 	    BEGIN fog include -->
diff --git a/Effects/flutter.eff b/Effects/flutter.eff
index 138d8ba4e..d4ca7b0cb 100644
--- a/Effects/flutter.eff
+++ b/Effects/flutter.eff
@@ -137,7 +137,7 @@
         -->
 			</texture-unit>
 			<texture-unit>
-				<unit>9</unit>
+				<unit>1</unit>
 				<type>noise</type>
 			</texture-unit>
 			<vertex-program-two-side>
@@ -185,7 +185,7 @@
 			<uniform>
 				<name>Noise</name>
 				<type>sampler-3d</type>
-				<value type="int">9</value>
+				<value type="int">1</value>
 			</uniform>
 			<uniform>
 				<name>WindE</name>
diff --git a/Effects/model-combined.eff b/Effects/model-combined.eff
index b92260926..19b761da8 100644
--- a/Effects/model-combined.eff
+++ b/Effects/model-combined.eff
@@ -244,6 +244,11 @@ please see Docs/README.model-combined.eff for documentation
 					<use>texture[0]/internal-format</use>
 				</internal-format>
 			</texture-unit>
+			<!-- Reflection Noise texture unit-->
+			<texture-unit>
+				<unit>1</unit>
+				<type>noise</type>
+			</texture-unit>
 			<!-- NormalMap texture unit-->
 			<texture-unit>
 				<unit>2</unit>
@@ -354,11 +359,7 @@ please see Docs/README.model-combined.eff for documentation
 					<use>texture[7]/internal-format</use>
 				</internal-format>
 			</texture-unit>
-			<!-- Reflection Noise texture unit-->
-			<texture-unit>
-				<unit>9</unit>
-				<type>noise</type>
-			</texture-unit>
+
 
 			<vertex-program-two-side>
 				<use>vertex-program-two-side</use>
@@ -385,6 +386,12 @@ please see Docs/README.model-combined.eff for documentation
 				<value type="int">0</value>
 			</uniform>
 
+            <uniform>
+				<name>ReflNoiseTex</name>
+				<type>sampler-3d</type>
+				<value type="int">1</value>
+			</uniform>
+			
 			<uniform>
 				<name>NormalTex</name>
 				<type>sampler-2d</type>
@@ -421,11 +428,7 @@ please see Docs/README.model-combined.eff for documentation
 				<value type="int">7</value>
 			</uniform>
 
-			<uniform>
-				<name>ReflNoiseTex</name>
-				<type>sampler-3d</type>
-				<value type="int">9</value>
-			</uniform>
+
 
 			<!-- 			NORMAL MAP -->
 			<!-- normalmap is used-->
diff --git a/Effects/reflect-bump-spec.eff b/Effects/reflect-bump-spec.eff
index 706a20730..be80df370 100644
--- a/Effects/reflect-bump-spec.eff
+++ b/Effects/reflect-bump-spec.eff
@@ -215,6 +215,30 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
 					<use>texture[0]/internal-format</use>
 				</internal-format>
 			</texture-unit>
+            
+            <texture-unit>
+				<unit>1</unit>
+				<image>
+					<use>texture[8]/image</use>
+				</image>
+				<filter>
+					<use>texture[8]/filter</use>
+				</filter>
+				<wrap-s>
+					<use>texture[8]/wrap-s</use>
+				</wrap-s>
+				<wrap-t>
+					<use>texture[8]/wrap-t</use>
+				</wrap-t>
+				<internal-format>
+					<use>texture[0]/internal-format</use>
+				</internal-format>
+			</texture-unit>
+
+			<texture-unit>
+				<unit>2</unit>
+				<type>noise</type>
+			</texture-unit>
 
 			<texture-unit>
 				<unit>4</unit>
@@ -288,30 +312,6 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
 				</wrap-t>
 			</texture-unit>
 
-			<texture-unit>
-				<unit>8</unit>
-				<image>
-					<use>texture[8]/image</use>
-				</image>
-				<filter>
-					<use>texture[8]/filter</use>
-				</filter>
-				<wrap-s>
-					<use>texture[8]/wrap-s</use>
-				</wrap-s>
-				<wrap-t>
-					<use>texture[8]/wrap-t</use>
-				</wrap-t>
-				<internal-format>
-					<use>texture[0]/internal-format</use>
-				</internal-format>
-			</texture-unit>
-
-			<texture-unit>
-				<unit>9</unit>
-				<type>noise</type>
-			</texture-unit>
-
 
 			<program>
 				<vertex-shader>Shaders/include_fog.vert</vertex-shader>
@@ -334,6 +334,18 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
 				<value type="int">0</value>
 			</uniform>
 
+            <uniform>
+				<name>Map</name>
+				<type>sampler-2d</type>
+				<value type="int">1</value>
+			</uniform>
+
+			<uniform>
+				<name>Noise</name>
+				<type>sampler-3d</type>
+				<value type="int">2</value>
+			</uniform>
+
 			<uniform>
 				<name>NormalTex</name>
 				<type>sampler-2d</type>
@@ -358,18 +370,6 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
 				<value type="int">7</value>
 			</uniform>
 
-			<uniform>
-				<name>Map</name>
-				<type>sampler-2d</type>
-				<value type="int">8</value>
-			</uniform>
-
-			<uniform>
-				<name>Noise</name>
-				<type>sampler-3d</type>
-				<value type="int">9</value>
-			</uniform>
-
 			<!-- set the amount of fringing colour 0.0 - 1.0 -->
 			<uniform>
 				<name>rainbowiness</name>
diff --git a/Effects/reflect.eff b/Effects/reflect.eff
index 3ad47b33f..108580dcf 100644
--- a/Effects/reflect.eff
+++ b/Effects/reflect.eff
@@ -195,6 +195,25 @@
 				</internal-format>
 			</texture-unit>
 
+            <texture-unit>
+				<unit>1</unit>
+				<image>
+					<use>texture[8]/image</use>
+				</image>
+				<filter>
+					<use>texture[8]/filter</use>
+				</filter>
+				<wrap-s>
+					<use>texture[8]/wrap-s</use>
+				</wrap-s>
+				<wrap-t>
+					<use>texture[8]/wrap-t</use>
+				</wrap-t>
+				<internal-format>
+					<use>texture[8]/internal-format</use>
+				</internal-format>
+			</texture-unit>
+			
 			<texture-unit>
 				<unit>2</unit>
 				<type>
@@ -207,7 +226,12 @@
 				<wrap-s>repeat</wrap-s>
 				<wrap-t>repeat</wrap-t>
 			</texture-unit>
-
+            
+            <texture-unit>
+				<unit>3</unit>
+				<type>noise</type>
+			</texture-unit>
+			
 			<texture-unit>
 				<unit>5</unit>
 				<type>
@@ -263,31 +287,6 @@
 				</wrap-t>
 			</texture-unit>
 
-			<texture-unit>
-				<unit>8</unit>
-				<image>
-					<use>texture[8]/image</use>
-				</image>
-				<filter>
-					<use>texture[8]/filter</use>
-				</filter>
-				<wrap-s>
-					<use>texture[8]/wrap-s</use>
-				</wrap-s>
-				<wrap-t>
-					<use>texture[8]/wrap-t</use>
-				</wrap-t>
-				<internal-format>
-					<use>texture[8]/internal-format</use>
-				</internal-format>
-			</texture-unit>
-
-			<texture-unit>
-				<unit>9</unit>
-				<type>noise</type>
-			</texture-unit>
-
-
 			<program>
 				<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader>
 				<vertex-shader n="1">Shaders/reflect.vert</vertex-shader>
@@ -313,12 +312,24 @@
 				<value type="int">0</value>
 			</uniform>
 
+			<uniform>
+				<name>Map</name>
+				<type>sampler-2d</type>
+				<value type="int">1</value>
+			</uniform>
+			
 			<uniform>
 				<name>Lightmap</name>
 				<type>sampler-2d</type>
 				<value type="int">2</value>
 			</uniform>
 
+            <uniform>
+				<name>Noise</name>
+				<type>sampler-3d</type>
+				<value type="int">3</value>
+			</uniform>
+			
 			<uniform>
 				<name>Environment</name>
 				<type>sampler-cube</type>
@@ -336,20 +347,6 @@
 				<type>sampler-2d</type>
 				<value type="int">7</value>
 			</uniform>
-
-			<uniform>
-				<name>Map</name>
-				<type>sampler-2d</type>
-				<value type="int">8</value>
-			</uniform>
-
-			<uniform>
-				<name>Noise</name>
-				<type>sampler-3d</type>
-				<value type="int">9</value>
-			</uniform>
-
-
 			<!-- set the amount of fringing colour 0.0 - 1.0 -->
 			<uniform>
 				<name>rainbowiness</name>
diff --git a/Effects/runway.eff b/Effects/runway.eff
index 8433eb4ab..8e9109f3c 100644
--- a/Effects/runway.eff
+++ b/Effects/runway.eff
@@ -123,6 +123,31 @@
 					<use>texture[1]/internal-format</use>
 				</internal-format>
 			</texture-unit>
+			
+			<texture-unit>
+				<unit>1</unit>
+				<image>
+					<use>texture[8]/image</use>
+				</image>
+				<filter>
+					<use>texture[8]/filter</use>
+				</filter>
+				<wrap-s>
+					<use>texture[8]/wrap-s</use>
+				</wrap-s>
+				<wrap-t>
+					<use>texture[8]/wrap-t</use>
+				</wrap-t>
+				<internal-format>
+					<use>texture[0]/internal-format</use>
+				</internal-format>
+			</texture-unit>
+
+			<texture-unit>
+				<unit>2</unit>
+				<type>noise</type>
+			</texture-unit>
+			
 			<texture-unit>
 				<unit>4</unit>
 				<image>
@@ -197,29 +222,6 @@
 				</wrap-t>
 			</texture-unit>
 
-			<texture-unit>
-				<unit>8</unit>
-				<image>
-					<use>texture[8]/image</use>
-				</image>
-				<filter>
-					<use>texture[8]/filter</use>
-				</filter>
-				<wrap-s>
-					<use>texture[8]/wrap-s</use>
-				</wrap-s>
-				<wrap-t>
-					<use>texture[8]/wrap-t</use>
-				</wrap-t>
-				<internal-format>
-					<use>texture[0]/internal-format</use>
-				</internal-format>
-			</texture-unit>
-
-			<texture-unit>
-				<unit>9</unit>
-				<type>noise</type>
-			</texture-unit>
 			<vertex-program-two-side>
 				<use>vertex-program-two-side</use>
 			</vertex-program-two-side>
@@ -248,6 +250,18 @@
 				<value type="int">0</value>
 			</uniform>
 
+            <uniform>
+				<name>Map</name>
+				<type>sampler-2d</type>
+				<value type="int">1</value>
+			</uniform>
+
+			<uniform>
+				<name>Noise</name>
+				<type>sampler-3d</type>
+				<value type="int">2</value>
+			</uniform>
+			
 			<uniform>
 				<name>NormalTex</name>
 				<type>sampler-2d</type>
@@ -272,18 +286,6 @@
 				<value type="int">7</value>
 			</uniform>
 
-			<uniform>
-				<name>Map</name>
-				<type>sampler-2d</type>
-				<value type="int">8</value>
-			</uniform>
-
-			<uniform>
-				<name>Noise</name>
-				<type>sampler-3d</type>
-				<value type="int">9</value>
-			</uniform>
-
 			<!-- set the amount of fringing colour 0.0 - 1.0 -->
 			<uniform>
 				<name>rainbowiness</name>
diff --git a/Effects/water.eff b/Effects/water.eff
index d58e282e9..607027dd2 100644
--- a/Effects/water.eff
+++ b/Effects/water.eff
@@ -199,6 +199,7 @@
 					<use>texture[0]/internal-format</use>
 				</internal-format>
 			</texture-unit>
+
 			<texture-unit>
 				<unit>2</unit>
 				<image>
@@ -289,10 +290,7 @@
 					<use>texture[6]/internal-format</use>
 				</internal-format>
 			</texture-unit>
-			<texture-unit>
-				<unit>9</unit>
-				<type>noise</type>
-			</texture-unit>
+
 			<program>
 				<vertex-shader>Shaders/include_fog.vert</vertex-shader>
 				<vertex-shader>Shaders/water.vert</vertex-shader>
@@ -304,6 +302,7 @@
 				<type>sampler-2d</type>
 				<value type="int">0</value>
 			</uniform>
+
 			<uniform>
 				<name>water_normalmap</name>
 				<type>sampler-2d</type>
@@ -449,11 +448,7 @@
 				</value>
 			</uniform>
 
-			<uniform>
-				<name>Noise</name>
-				<type>sampler-3d</type>
-				<value type="int">9</value>
-			</uniform>
+
 			
 			<!-- 	    BEGIN fog include -->
 			<uniform>
@@ -661,10 +656,7 @@
 					<use>texture[6]/internal-format</use>
 				</internal-format>
 			</texture-unit>
-			<texture-unit>
-				<unit>9</unit>
-				<type>noise</type>
-			</texture-unit>
+
 			<program>
 				<vertex-shader>Shaders/include_fog.vert</vertex-shader>
 				<vertex-shader>Shaders/water.vert</vertex-shader>
@@ -823,11 +815,6 @@
 				</value>
 			</uniform>
 
-			<uniform>
-				<name>Noise</name>
-				<type>sampler-3d</type>
-				<value type="int">9</value>
-			</uniform>
 			<!-- 	    BEGIN fog include -->
 			<uniform>
 				<name>visibility</name>
diff --git a/Shaders/water.frag b/Shaders/water.frag
index 49c536c33..f640f6958 100644
--- a/Shaders/water.frag
+++ b/Shaders/water.frag
@@ -14,8 +14,6 @@ uniform sampler2D water_reflection_grey;
 uniform sampler2D sea_foam;
 uniform sampler2D perlin_normalmap;
 
-uniform sampler3D Noise;
-
 uniform float saturation, Overcast, WindE, WindN;
 uniform float CloudCover0, CloudCover1, CloudCover2, CloudCover3, CloudCover4;
 uniform float osg_SimulationTime;