diff --git a/Models/Geometry/Nimitz/Effects/bowwave_carrier.eff b/Models/Geometry/Nimitz/Effects/bowwave_carrier.eff
new file mode 100644
index 000000000..5adea2f17
--- /dev/null
+++ b/Models/Geometry/Nimitz/Effects/bowwave_carrier.eff
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PropertyList>
+
+    <name>bowwave-truman</name>
+    <inherits-from>Effects/bowwave</inherits-from>
+
+    <parameters>
+		<speed-kt>
+			<use>controls/base-speed-kts</use>
+		</speed-kt>
+		<heading-deg>
+			<use>controls/base-course-deg</use>
+		</heading-deg>
+
+ 
+    </parameters>
+
+</PropertyList>
diff --git a/Models/Geometry/Nimitz/Models/Effects/bow_wave_carrier.xml b/Models/Geometry/Nimitz/Models/Effects/bow_wave_carrier.xml
new file mode 100644
index 000000000..587126562
--- /dev/null
+++ b/Models/Geometry/Nimitz/Models/Effects/bow_wave_carrier.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<PropertyList>
+	<path>Models/Effects/Wakes/BowWave.ac</path>
+
+  <animation>
+  	<type>rotate</type>
+  	<property>wave-motion/pitch</property>
+  	<factor>-0.8</factor>
+  	<center>
+   		<x-m>25</x-m>
+   		<y-m>0</y-m>
+   		<z-m>0</z-m>
+  	</center>
+  	<axis>
+   		<x>0</x>
+   		<y>1</y>
+   		<z>0</z>
+  	</axis>
+   </animation>
+
+  <animation>
+  	<type>rotate</type>
+  	<property>wave-motion/roll</property>
+  	<factor>-1</factor>
+  	<center>
+   		<x-m>25</x-m>
+   		<y-m>0</y-m>
+   		<z-m>0</z-m>
+  	</center>
+  	<axis>
+   		<x>1</x>
+   		<y>0</y>
+   		<z>0</z>
+  	</axis>
+  </animation>
+
+	<effect>
+		<inherits-from>Models/Geometry/Nimitz/Effects/bowwave_carrier</inherits-from>
+		<!--<object-name>BWave</object-name>-->
+		<object-name>BWavePort</object-name>
+		<object-name>BWaveStbd</object-name>
+	</effect>
+
+</PropertyList>
diff --git a/Models/Geometry/Nimitz/Models/Effects/wake2_carrier.xml b/Models/Geometry/Nimitz/Models/Effects/wake2_carrier.xml
new file mode 100644
index 000000000..0e31c8833
--- /dev/null
+++ b/Models/Geometry/Nimitz/Models/Effects/wake2_carrier.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+
+	<particlesystem>
+		<name>wake2</name>
+		<texture>../../../../Effects/Wakes/smoke-large.png</texture>
+		<emissive>false</emissive>
+		<lighting>false</lighting>
+
+		<offsets>
+			<x-m>0</x-m>
+			<y-m>0</y-m>
+			<z-m>0</z-m>
+		</offsets>
+
+		<attach>world</attach>
+
+		<placer>
+			<type>segments</type>
+			<vertex>
+				<x-m>0</x-m>
+				<y-m>-12</y-m>
+				<z-m>-2</z-m>
+			</vertex>
+			<vertex>
+				<x-m>0</x-m>
+				<y-m>-10</y-m>
+				<z-m>-1</z-m>
+			</vertex>
+			<vertex>
+				<x-m>0</x-m>
+				<y-m>0</y-m>
+				<z-m>0</z-m>
+			</vertex>
+				<vertex>
+				<x-m>0</x-m>
+				<y-m>10</y-m>
+				<z-m>-1</z-m>
+			</vertex>
+			<vertex>
+			<x-m>0</x-m>
+			<y-m>12</y-m>
+			<z-m>-2</z-m>
+			</vertex>
+		</placer>
+
+		<shooter>
+			<theta-min-deg>80</theta-min-deg>
+			<theta-max-deg>100</theta-max-deg>
+			<phi-min-deg>85</phi-min-deg>
+			<phi-max-deg>90</phi-max-deg>
+			<speed-mps>
+				<!--<value>20</value>-->
+				<property>controls/base-speed-kts</property>
+				<factor>0.2572</factor>
+				<spread>10</spread>
+			</speed-mps>
+			<rotation-speed>
+				<!--<x-max-deg-sec>15</x-max-deg-sec>
+				<x-min-deg-sec>-15</x-min-deg-sec>-->
+				<!--<y-max-deg-sec>15</y-max-deg-sec>
+				<y-min-deg-sec>-15</y-min-deg-sec>-->
+				<z-max-deg-sec>15</z-max-deg-sec>
+				<z-min-deg-sec>-15</z-min-deg-sec>
+			</rotation-speed>
+		</shooter>
+
+		<counter>
+			<particles-per-sec>
+				<property>controls/base-speed-kts</property>
+				<factor>0.1</factor>
+				<!--<value>2.5</value>-->
+				<spread>1.0</spread>
+			</particles-per-sec>
+		</counter>
+
+		<align>fixed</align>
+
+		<particle>
+			<start>
+				<color>
+					<red>
+						<property>/rendering/scene/diffuse/red</property>
+					</red>
+					<green>
+						<property>/rendering/scene/diffuse/red</property>
+					</green>
+					<blue>
+						<property>/rendering/scene/diffuse/red</property>
+					</blue>
+					<alpha>
+						<value>0.25</value>
+					</alpha>
+				</color>
+				<size>
+					<value>10.0</value>
+				</size>
+			</start>
+			<end>
+				<color>
+					<red>
+						<property>/rendering/scene/diffuse/red</property>
+					</red>
+					<green>
+						<property>/rendering/scene/diffuse/red</property>
+					</green>
+					<blue>
+						<property>/rendering/scene/diffuse/red</property>
+					</blue>
+					<alpha>
+						<value>0.1</value>
+					</alpha>
+				</color>
+				<size>
+					<value>12.0</value>
+				</size>
+			</end>
+			<life-sec>
+				<value>120</value>
+			</life-sec>
+			<mass-kg>0.025</mass-kg>
+			<radius-m>0.175</radius-m>
+		</particle>
+
+		<program>
+			<fluid>water</fluid>
+			<gravity>false</gravity>
+			<wind>false</wind>
+		</program>
+
+	</particlesystem>
+
+</PropertyList>
diff --git a/Models/Geometry/Nimitz/Models/Effects/wake_carrier.xml b/Models/Geometry/Nimitz/Models/Effects/wake_carrier.xml
new file mode 100644
index 000000000..4c813b4c0
--- /dev/null
+++ b/Models/Geometry/Nimitz/Models/Effects/wake_carrier.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+
+	<particlesystem>
+		<name>wake</name>
+		<texture>../../../../Effects/Wakes/smoke-large.png</texture>
+		<emissive>false</emissive>
+		<lighting>false</lighting>
+
+		<offsets>
+			<x-m>0</x-m>
+			<y-m>0</y-m>
+			<z-m>0</z-m>
+		</offsets>
+
+		<attach>world</attach>
+
+		<placer>
+			<type>segments</type>
+			<vertex>
+				<x-m>0</x-m>
+				<y-m>0</y-m>
+				<z-m>0</z-m>
+			</vertex>
+			<vertex>
+				<x-m>0</x-m>
+				<y-m>1.0</y-m>
+				<z-m>0</z-m>
+			</vertex>
+			<vertex>
+				<x-m>6.5</x-m>
+				<y-m>7.5</y-m>
+				<z-m>0</z-m>
+			</vertex>
+			<vertex>
+				<x-m>13</x-m>
+				<y-m>15.0</y-m>
+				<z-m>0</z-m>
+			</vertex>
+		</placer>
+
+		<shooter>
+			<theta-min-deg>80</theta-min-deg>
+			<theta-max-deg>100</theta-max-deg>
+			<phi-min-deg>85</phi-min-deg>
+			<phi-max-deg>90</phi-max-deg>
+			<speed-mps>
+				<property>controls/base-speed-kts</property>
+				<factor>0.514</factor>
+				<spread>10</spread>
+			</speed-mps>
+			<rotation-speed>
+				<!--<x-max-deg-sec>15</x-max-deg-sec>
+				<x-min-deg-sec>-15</x-min-deg-sec>-->
+				<!--<y-max-deg-sec>15</y-max-deg-sec>
+				<y-min-deg-sec>-15</y-min-deg-sec>-->
+				<z-max-deg-sec>15</z-max-deg-sec>
+				<z-min-deg-sec>-15</z-min-deg-sec>
+			</rotation-speed>
+		</shooter>
+
+		<counter>
+			<particles-per-sec>
+				<property>controls/base-speed-kts</property>
+				<factor>0.1</factor>
+				<!--<value>3.0</value>-->
+				<spread>1.0</spread>
+			</particles-per-sec>
+		</counter>
+
+		<align>fixed</align>
+
+		<particle>
+			<start>
+				<color>
+					<red>
+						<property>/rendering/scene/diffuse/red</property>
+					</red>
+					<green>
+						<property>/rendering/scene/diffuse/red</property>
+					</green>
+					<blue>
+						<property>/rendering/scene/diffuse/red</property>
+					</blue>
+					<alpha>
+						<value>0.25</value>
+					</alpha>
+				</color>
+				<size>
+					<value>10.0</value>
+				</size>
+			</start>
+			<end>
+				<color>
+					<red>
+						<property>/rendering/scene/diffuse/red</property>
+					</red>
+					<green>
+						<property>/rendering/scene/diffuse/red</property>
+					</green>
+					<blue>
+						<property>/rendering/scene/diffuse/red</property>
+					</blue>
+					<alpha>
+						<value>0.1</value>
+					</alpha>
+				</color>
+				<size>
+					<value>12.0</value>
+				</size>
+			</end>
+			<life-sec>
+				<value>120</value>
+			</life-sec>
+			<mass-kg>1.0</mass-kg>
+			<radius-m>0.5</radius-m>
+		</particle>
+
+		<program>
+			<fluid>water</fluid>
+			<gravity>false</gravity>
+			<wind>false</wind>
+		</program>
+
+	</particlesystem>
+
+</PropertyList>
diff --git a/Models/Geometry/Nimitz/truman.xml b/Models/Geometry/Nimitz/truman.xml
old mode 100755
new mode 100644
index 55f11a1a6..551394eb0
--- a/Models/Geometry/Nimitz/truman.xml
+++ b/Models/Geometry/Nimitz/truman.xml
@@ -535,10 +535,10 @@ by Thorsten Renk 2017
 
   <model>
     <name>Bow-Wave</name>
-    <path>Models/Effects/Wakes/bow_wave.xml</path>
+    <path>Models/Geometry/Nimitz/Models/Effects/bow_wave_carrier.xml</path>
     <offsets>
       <x-m>-15</x-m>
-      <z-m>0</z-m>
+      <z-m>0.0</z-m>
     </offsets>
   </model>
 
@@ -2971,22 +2971,22 @@ by Thorsten Renk 2017
   <!-- *** Effects *** -->
   <model>
     <name>bowwake-stbd</name>
-    <path>Models/Effects/Wakes/wake.xml</path>
+    <path>Models/Geometry/Nimitz/Models/Effects/wake_carrier.xml</path>
     <offsets>
       <x-m>-98.0</x-m>
       <y-m>0</y-m>
-      <z-m>1</z-m>
+      <z-m>2</z-m>
       <heading-deg>0</heading-deg>
     </offsets>
   </model>
 
   <model>
     <name>bowwake-port</name>
-    <path>Models/Effects/Wakes/wake.xml</path>
+    <path>Models/Geometry/Nimitz/Models/Effects/wake_carrier.xml</path>
     <offsets>
       <x-m>-98.0</x-m>
       <y-m>0</y-m>
-      <z-m>1</z-m>
+      <z-m>2</z-m>
       <heading-deg>0</heading-deg>
     </offsets>
     <overlay>
@@ -3030,11 +3030,11 @@ by Thorsten Renk 2017
 
   <model>
     <name>sternwake</name>
-    <path>Models/Effects/Wakes/wake2.xml</path>
+    <path>Models/Geometry/Nimitz/Models/Effects/wake2_carrier.xml</path>
     <offsets>
       <x-m>210</x-m>
       <y-m>0</y-m>
-      <z-m>1</z-m>
+      <z-m>2</z-m>
       <heading-deg>0</heading-deg>
     </offsets>
   </model>