diff --git a/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackAnvil.cfg b/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackAnvil.cfg
index 8c07f85..9bbd9a2 100644
--- a/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackAnvil.cfg
+++ b/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackAnvil.cfg
@@ -1,4 +1,4 @@
-@PART[black_anvil_engine_s1_1]:FOR[RealPlume]:NEEDS[RealPlume,SmokeScreen,CRE]
+@PART[black_anvil_engine_s1_1]:FOR[RealPlume]:NEEDS[RealPlume,SmokeScreen,CRE,!Waterfall]
 {
       @MODULE[ModuleEngines*]
       {
@@ -25,7 +25,7 @@
       plume2Scale = 0.2
       }
 }
-@PART[black_anvil_engine_s1_1]:NEEDS[RealPlume,SmokeScreen,CRE]:AFTER[zzRealPlume]
+@PART[black_anvil_engine_s1_1]:NEEDS[RealPlume,SmokeScreen,CRE,!Waterfall]:AFTER[zzRealPlume]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackArrow.cfg b/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackArrow.cfg
index c35ab85..b47c827 100644
--- a/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackArrow.cfg
+++ b/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackArrow.cfg
@@ -1,4 +1,4 @@
-@PART[black_arrow_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[black_arrow_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
   PLUME
   {
@@ -29,7 +29,7 @@
   }
 }
 //boost volume
-@PART[black_arrow_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE]:FOR[zzRealPlume]
+@PART[black_arrow_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]:FOR[zzRealPlume]
 {
   @EFFECTS
   {
@@ -51,7 +51,7 @@
   }
 }
 
-@PART[black_arrow_engine_s1_2]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[black_arrow_engine_s1_2]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
   PLUME
   {
@@ -81,7 +81,7 @@
     %powerEffectName = HTP_RP1_Lower
   }
 }
-@PART[black_arrow_engine_s1_3]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[black_arrow_engine_s1_3]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
   PLUME
   {
diff --git a/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackKnight.cfg b/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackKnight.cfg
index f3949c4..cb705aa 100644
--- a/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackKnight.cfg
+++ b/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackKnight.cfg
@@ -1,4 +1,4 @@
-@PART[black_knight_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[black_knight_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
   PLUME
   {
diff --git a/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlueSteel.cfg b/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlueSteel.cfg
index 9a8b4d2..cdb6f13 100644
--- a/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlueSteel.cfg
+++ b/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlueSteel.cfg
@@ -1,4 +1,4 @@
-@PART[blue_steel_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[blue_steel_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
   PLUME
   {
diff --git a/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlueStreak.cfg b/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlueStreak.cfg
index 35c2bfc..28a8ecf 100644
--- a/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlueStreak.cfg
+++ b/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlueStreak.cfg
@@ -1,4 +1,4 @@
-@PART[blue_streak_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[blue_streak_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
     @MODULE[ModuleEngines*]
     {
@@ -25,7 +25,7 @@
 		}
 }
 
-@PART[blue_streak_engine_s1_2]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[blue_streak_engine_s1_2]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
     @MODULE[ModuleEngines*]
     {
@@ -55,7 +55,7 @@
 		}
 }
 
-@PART[blue_streak_engine_s1_3]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[blue_streak_engine_s1_3]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
     @MODULE[ModuleEngines*]
     {
@@ -80,7 +80,7 @@
 				streamScale = 1.2
 	}
 }
-@PART[blue_streak_engine_s1_3]:NEEDS[zRealPlume,Smokescreen,CRE]:FOR[zzRealPlume]
+@PART[blue_streak_engine_s1_3]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]:FOR[zzRealPlume]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/Fuji/Polaris_Engine_A.cfg b/GameData/RealPlume-Stock/Fuji/Polaris_Engine_A.cfg
index 1969549..8bd1da0 100644
--- a/GameData/RealPlume-Stock/Fuji/Polaris_Engine_A.cfg
+++ b/GameData/RealPlume-Stock/Fuji/Polaris_Engine_A.cfg
@@ -1,4 +1,4 @@
-@PART[Polaris_Engine_A]:NEEDS[RealPlume,SmokeScreen]
+@PART[Polaris_Engine_A]:NEEDS[RealPlume,SmokeScreen,!Waterfall]
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/GemstoneLV/gemstone_engine_srbem_s1_1.cfg b/GameData/RealPlume-Stock/GemstoneLV/gemstone_engine_srbem_s1_1.cfg
new file mode 100644
index 0000000..4890498
--- /dev/null
+++ b/GameData/RealPlume-Stock/GemstoneLV/gemstone_engine_srbem_s1_1.cfg
@@ -0,0 +1,28 @@
+@PART[gemstone_engine_srbem_s1_1]:AFTER[GemstoneLV]
+{
+  !EFFECTS {}
+}
+@PART[gemstone_engine_srbem_s1_1]:NEEDS[zRealPlume,SmokeScreen,GemstoneLV]// BACC "Thumper" Solid Fuel Booster
+{
+    PLUME
+    {
+        name = Solid-Lower
+        transformName = thrustTransform
+        localRotation = 0,0,0
+        flarePosition = 0,0,0.0
+        plumePosition = 0,0,0.2
+        smokePosition = 0,0,0.1
+        slagPosition = 0,0,0
+        flareScale = 1
+        plumeScale = 1
+        smokeScale = 1.2
+        slagScale = 0.7
+        energy = 1
+        speed = 1
+        emissionMult = 0.5
+    }
+    @MODULE[ModuleEngines*]
+    {
+        %powerEffectName = Solid-Lower
+    }
+}
diff --git a/GameData/RealPlume-Stock/Global Patches.cfg b/GameData/RealPlume-Stock/Global Patches.cfg
index 96aa8df..b39086b 100644
--- a/GameData/RealPlume-Stock/Global Patches.cfg	
+++ b/GameData/RealPlume-Stock/Global Patches.cfg	
@@ -76,4 +76,13 @@
             }
         }
     }
-}
\ No newline at end of file
+}
+//  ==================================================
+//  Deconflict with WaterfallFX plume mod
+//  When waterfall FX is installed, waterfall takes priority over RealPlume
+// Has Audio issues, disabled for now. Deconflicting done on individual basis.
+//  ==================================================
+//@PART:HAS[@MODULE[ModuleWaterfallFX]]:BEFORE[zRealPlume]
+//{
+//  !PLUME{}
+//}
diff --git a/GameData/RealPlume-Stock/Kerbal Atomics/Kerbal Atomics.cfg b/GameData/RealPlume-Stock/Kerbal Atomics/Kerbal Atomics.cfg
index 1edbfa6..f480dfe 100644
--- a/GameData/RealPlume-Stock/Kerbal Atomics/Kerbal Atomics.cfg	
+++ b/GameData/RealPlume-Stock/Kerbal Atomics/Kerbal Atomics.cfg	
@@ -1,6 +1,6 @@
 //0.625m
 
-@PART[ntr-sc-0625-1]:FOR[RealPlume]:NEEDS[SmokeScreen] //Eel
+@PART[ntr-sc-0625-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] //Eel
 {
   PLUME
   {
@@ -29,7 +29,7 @@
 
 //1.25m
 
-@PART[ntr-sc-125-1]:FOR[RealPlume]:NEEDS[SmokeScreen] //Neptune
+@PART[ntr-sc-125-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] //Neptune
 {
     PLUME
     {
@@ -78,7 +78,7 @@
     }
 }
 
-@PART[ntr-sc-125-2]:FOR[RealPlume]:NEEDS[SmokeScreen] // Stubber
+@PART[ntr-sc-125-2]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // Stubber
 {
     PLUME
     {
@@ -131,7 +131,7 @@
 
 //2.5m
 
-@PART[ntr-sc-25-1]:FOR[RealPlume]:NEEDS[SmokeScreen] // Trimodal Solid Core - 2.5m - Poseidon
+@PART[ntr-sc-25-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // Trimodal Solid Core - 2.5m - Poseidon
 {
     PLUME
     {
@@ -180,7 +180,7 @@
     }
 }
 
-@PART[ntr-gc-25-1]:FOR[RealPlume]:NEEDS[SmokeScreen] //Liberator closed cycle gas core
+@PART[ntr-gc-25-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] //Liberator closed cycle gas core
 {
   PLUME
   {
@@ -208,7 +208,7 @@
 }
 
 
-@PART[ntr-gc-25-2]:FOR[RealPlume]:NEEDS[SmokeScreen] // Emancipator open cycle gas core
+@PART[ntr-gc-25-2]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // Emancipator open cycle gas core
 {
   PLUME
   {
@@ -234,7 +234,7 @@
         !runningEffectName = DELETE
     }
 }
-@PART[ntr-gc-25-2]:FOR[zzRealPlume]
+@PART[ntr-gc-25-2]:FOR[zzRealPlume,!Waterfall]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/Knes/Knes_Engine_EPS.cfg b/GameData/RealPlume-Stock/Knes/Knes_Engine_EPS.cfg
index 708cd35..b1469de 100644
--- a/GameData/RealPlume-Stock/Knes/Knes_Engine_EPS.cfg
+++ b/GameData/RealPlume-Stock/Knes/Knes_Engine_EPS.cfg
@@ -1,4 +1,4 @@
-@PART[Knes_Engine_EPS]:FOR[RealPlume]:NEEDS[SmokeScreen]
+@PART[Knes_Engine_EPS]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall]
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/Knes/Knes_Engine_Vulcain.cfg b/GameData/RealPlume-Stock/Knes/Knes_Engine_Vulcain.cfg
index f61f420..7e07753 100644
--- a/GameData/RealPlume-Stock/Knes/Knes_Engine_Vulcain.cfg
+++ b/GameData/RealPlume-Stock/Knes/Knes_Engine_Vulcain.cfg
@@ -1,4 +1,4 @@
-@PART[Knes_Engine_Vulcain]:FOR[RealPlume]:NEEDS[SmokeScreen] // KS-68 'Mars' Cryogenic Rocket Engine
+@PART[Knes_Engine_Vulcain]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // KS-68 'Mars' Cryogenic Rocket Engine
 {
       @MODULE[ModuleEngines*]
       {
@@ -28,7 +28,7 @@
       }
 }
 //add engine flare since no internal emissive
-@PART[Knes_Engine_Vulcain]:FOR[zzRealPlume]:NEEDS[SmokeScreen]
+@PART[Knes_Engine_Vulcain]:FOR[zzRealPlume]:NEEDS[SmokeScreen,!Waterfall]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/Knes/Knes_Engine_Zebulon.cfg b/GameData/RealPlume-Stock/Knes/Knes_Engine_Zebulon.cfg
index 2240425..43ce259 100644
--- a/GameData/RealPlume-Stock/Knes/Knes_Engine_Zebulon.cfg
+++ b/GameData/RealPlume-Stock/Knes/Knes_Engine_Zebulon.cfg
@@ -1,4 +1,4 @@
-@PART[Knes_Engine_Zebulon]:FOR[RealPlume]:NEEDS[SmokeScreen] // Ariane 4 cryogenic 3rd stage engine HM7 "Zebulon" Liquid Fuel Engine
+@PART[Knes_Engine_Zebulon]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // Ariane 4 cryogenic 3rd stage engine HM7 "Zebulon" Liquid Fuel Engine
 {
       @MODULE[ModuleEngines*]
       {
@@ -25,7 +25,7 @@
       plume2Scale = 0.45
       }
 }
-@PART[Knes_Engine_Zebulon]:FOR[zzRealPlume]
+@PART[Knes_Engine_Zebulon]:FOR[zzRealPlume]:NEEDS[!Waterfall]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/Knes/Knes_Hermes_Engine_Mk91.cfg b/GameData/RealPlume-Stock/Knes/Knes_Hermes_Engine_Mk91.cfg
index 3c9b752..ebf44a2 100644
--- a/GameData/RealPlume-Stock/Knes/Knes_Hermes_Engine_Mk91.cfg
+++ b/GameData/RealPlume-Stock/Knes/Knes_Hermes_Engine_Mk91.cfg
@@ -1,4 +1,4 @@
-@PART[Knes_Hermes_Engine_Mk91]:FOR[RealPlume]:NEEDS[SmokeScreen] // Hermes Mk-91 "Callisto" Monoprop Engine
+@PART[Knes_Hermes_Engine_Mk91]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // Hermes Mk-91 "Callisto" Monoprop Engine
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/Knes/Knes_Service_Module_Viking_09375.cfg b/GameData/RealPlume-Stock/Knes/Knes_Service_Module_Viking_09375.cfg
index 7fd1239..bafeffe 100644
--- a/GameData/RealPlume-Stock/Knes/Knes_Service_Module_Viking_09375.cfg
+++ b/GameData/RealPlume-Stock/Knes/Knes_Service_Module_Viking_09375.cfg
@@ -1,4 +1,4 @@
-@PART[Knes_Service_Module_Viking_09375]:FOR[RealPlume]:NEEDS[SmokeScreen]
+@PART[Knes_Service_Module_Viking_09375]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall]
 {
     @EFFECTS
     {
@@ -28,7 +28,7 @@
 				streamScale = 0.1
 	}
 }
-@PART[Knes_Service_Module_Viking_09375]:FOR[zzRealPlume]
+@PART[Knes_Service_Module_Viking_09375]:FOR[zzRealPlume]:NEEDS[!Waterfall]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Catherine_Stage_1875.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Catherine_Stage_1875.cfg
index 58a9ae1..4165173 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_Catherine_Stage_1875.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_Catherine_Stage_1875.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Catherine_Stage_1875]:NEEDS[RealPlume,SmokeScreen] //
+@PART[_Knes_Catherine_Stage_1875]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Cora_Engine_1.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Cora_Engine_1.cfg
index 2072aab..b4a4b99 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_Cora_Engine_1.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_Cora_Engine_1.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Cora_Engine_1]:NEEDS[RealPlume,SmokeScreen] //
+@PART[_Knes_Cora_Engine_1]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Cora_Engine_SL.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Cora_Engine_SL.cfg
index 334b569..fed5061 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_Cora_Engine_SL.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_Cora_Engine_SL.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Cora_Engine_SL]:NEEDS[RealPlume,SmokeScreen] //
+@PART[_Knes_Cora_Engine_SL]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Diamant_Engine_09375.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Diamant_Engine_09375.cfg
index e7baa43..08c3422 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_Diamant_Engine_09375.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_Diamant_Engine_09375.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Diamant_Engine_09375]:FOR[RealPlume]:NEEDS[SmokeScreen] // KEREB-D "Riotous" Engine
+@PART[_Knes_Diamant_Engine_09375]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // KEREB-D "Riotous" Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Diane_Engine_125.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Diane_Engine_125.cfg
index 388348a..9987c56 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_Diane_Engine_125.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_Diane_Engine_125.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Diane_Engine_125]:NEEDS[RealPlume,SmokeScreen] //
+@PART[_Knes_Diane_Engine_125]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_H2_Engine_09375.cfg b/GameData/RealPlume-Stock/Knes/_Knes_H2_Engine_09375.cfg
index 7f1c815..149d2e3 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_H2_Engine_09375.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_H2_Engine_09375.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_H2_Engine_09375]:FOR[RealPlume]:NEEDS[SmokeScreen] //
+@PART[_Knes_H2_Engine_09375]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] //
 {
       @MODULE[ModuleEngines*]
       {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_H3_Engine_0625.cfg b/GameData/RealPlume-Stock/Knes/_Knes_H3_Engine_0625.cfg
index 0c273d1..baf582c 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_H3_Engine_0625.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_H3_Engine_0625.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_H3_Engine_0625]:FOR[RealPlume]:NEEDS[SmokeScreen] //
+@PART[_Knes_H3_Engine_0625]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] //
 {
       @MODULE[ModuleEngines*]
       {
@@ -25,7 +25,7 @@
       plume2Scale = 0.1
       }
 }
-@PART[_Knes_H3_Engine_0625]:FOR[zzRealPlume]:NEEDS[SmokeScreen]
+@PART[_Knes_H3_Engine_0625]:FOR[zzRealPlume]:NEEDS[SmokeScreen,!Waterfall]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_L3S_HM4_Engine.cfg b/GameData/RealPlume-Stock/Knes/_Knes_L3S_HM4_Engine.cfg
index eea536d..9d63c1d 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_L3S_HM4_Engine.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_L3S_HM4_Engine.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_L3S_HM4_Engine]:FOR[RealPlume]:NEEDS[SmokeScreen] //
+@PART[_Knes_L3S_HM4_Engine]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] //
 {
       @MODULE[ModuleEngines*]
       {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_L3S_L140.cfg b/GameData/RealPlume-Stock/Knes/_Knes_L3S_L140.cfg
index 8f85297..2df1a4b 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_L3S_L140.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_L3S_L140.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_L3S_L140]:NEEDS[RealPlume,SmokeScreen] // Ariane L-140 "Drakkar" Stage
+@PART[_Knes_L3S_L140]:NEEDS[RealPlume,SmokeScreen,!Waterfall] // Ariane L-140 "Drakkar" Stage
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_L3S_L220.cfg b/GameData/RealPlume-Stock/Knes/_Knes_L3S_L220.cfg
index 53dd89b..62df471 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_L3S_L220.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_L3S_L220.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_L3S_L220]:NEEDS[RealPlume,SmokeScreen] // Ariane L-220 "Valkyrie" Stage
+@PART[_Knes_L3S_L220]:NEEDS[RealPlume,SmokeScreen,!Waterfall] // Ariane L-220 "Valkyrie" Stage
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_L3S_L220N.cfg b/GameData/RealPlume-Stock/Knes/_Knes_L3S_L220N.cfg
index fe2b60d..83e801c 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_L3S_L220N.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_L3S_L220N.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_L3S_L220N]:NEEDS[RealPlume,SmokeScreen] // Ariane L-220N "Ragnarok" Stage
+@PART[_Knes_L3S_L220N]:NEEDS[RealPlume,SmokeScreen,!Waterfall] // Ariane L-220N "Ragnarok" Stage
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_L3S_L33_Engine.cfg b/GameData/RealPlume-Stock/Knes/_Knes_L3S_L33_Engine.cfg
index b3b91b0..9a3da68 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_L3S_L33_Engine.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_L3S_L33_Engine.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_L3S_L33_Engine]:NEEDS[RealPlume,SmokeScreen] //Ariane 4 second stage 1.875m engine L33 "Byrding" Liquid Fuel Engine
+@PART[_Knes_L3S_L33_Engine]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //Ariane 4 second stage 1.875m engine L33 "Byrding" Liquid Fuel Engine
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_L3S_L3S_HM60_Engine.cfg b/GameData/RealPlume-Stock/Knes/_Knes_L3S_L3S_HM60_Engine.cfg
index fc797b0..4e39589 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_L3S_L3S_HM60_Engine.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_L3S_L3S_HM60_Engine.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_L3S_L3S_HM60_Engine]:NEEDS[RealPlume,SmokeScreen] //Ariane 4 second stage 1.875m engine L33 "Byrding" Liquid Fuel Engine
+@PART[_Knes_L3S_L3S_HM60_Engine]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //Ariane 4 second stage 1.875m engine L33 "Byrding" Liquid Fuel Engine
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_L3S_PAL.cfg b/GameData/RealPlume-Stock/Knes/_Knes_L3S_PAL.cfg
index 425ef65..4c366aa 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_L3S_PAL.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_L3S_PAL.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_L3S_PAL]:NEEDS[RealPlume,SmokeScreen] // LRB Ariane "Drako" PAL Booster
+@PART[_Knes_L3S_PAL]:NEEDS[RealPlume,SmokeScreen,!Waterfall] // LRB Ariane "Drako" PAL Booster
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Mireille_Engine_09375.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Mireille_Engine_09375.cfg
index 4d44e63..ec7fa4a 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_Mireille_Engine_09375.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_Mireille_Engine_09375.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Mireille_Engine_09375]:NEEDS[RealPlume,SmokeScreen] //
+@PART[_Knes_Mireille_Engine_09375]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Veronique_Engine_03125.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Veronique_Engine_03125.cfg
index 88ce834..746dc64 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_Veronique_Engine_03125.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_Veronique_Engine_03125.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Veronique_Engine_03125]:FOR[RealPlume]:NEEDS[SmokeScreen] // AGI-E "Vekin" Engine
+@PART[_Knes_Veronique_Engine_03125]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // AGI-E "Vekin" Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Vesta_Engine_0625.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Vesta_Engine_0625.cfg
index fd807bc..887a225 100644
--- a/GameData/RealPlume-Stock/Knes/_Knes_Vesta_Engine_0625.cfg
+++ b/GameData/RealPlume-Stock/Knes/_Knes_Vesta_Engine_0625.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Vesta_Engine_0625]:FOR[RealPlume]:NEEDS[SmokeScreen] // LRBA-V "Gauntness" Engine
+@PART[_Knes_Vesta_Engine_0625]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // LRBA-V "Gauntness" Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Luciole/EnginesLiquid.cfg b/GameData/RealPlume-Stock/Luciole/EnginesLiquid.cfg
index 77561f6..5737a8a 100644
--- a/GameData/RealPlume-Stock/Luciole/EnginesLiquid.cfg
+++ b/GameData/RealPlume-Stock/Luciole/EnginesLiquid.cfg
@@ -1,4 +1,4 @@
-@PART[_Luciole_Navier_Engine_03125]:NEEDS[zRealPlume,SmokeScreen,Luciole]
+@PART[_Luciole_Navier_Engine_03125]:NEEDS[zRealPlume,SmokeScreen,Luciole,!Waterfall]
 {
     @MODULE[ModuleEngines*]
     {
@@ -25,7 +25,7 @@
 
 		}
 }
-@PART[_Luciole_Navier_Engine_03125]:NEEDS[zRealPlume,SmokeScreen,Luciole]:AFTER[zzRealPlume]
+@PART[_Luciole_Navier_Engine_03125]:NEEDS[zRealPlume,SmokeScreen,Luciole,!Waterfall]:AFTER[zzRealPlume]
 {
   @EFFECTS
   {
@@ -49,7 +49,7 @@
   }
 }
 
-@PART[_Luciole_Navier_Vaccum_Engine_0625]:NEEDS[zRealPlume,SmokeScreen,Luciole]
+@PART[_Luciole_Navier_Vaccum_Engine_0625]:NEEDS[zRealPlume,SmokeScreen,Luciole,!Waterfall]
 {
 		@MODULE[ModuleEngines*]
 		{
@@ -76,7 +76,7 @@
 		plumeScale = 0.35
 		}
 }
-@PART[_Luciole_Navier_Vaccum_Engine_0625]:NEEDS[zRealPlume,SmokeScreen,Luciole]:AFTER[zzRealPlume]
+@PART[_Luciole_Navier_Vaccum_Engine_0625]:NEEDS[zRealPlume,SmokeScreen,Luciole,!Waterfall]:AFTER[zzRealPlume]
 {
   @EFFECTS
   {
@@ -102,7 +102,7 @@
 
 
 
-@PART[_Luciole_KickStage_0625]:NEEDS[zRealPlume,SmokeScreen,Luciole]
+@PART[_Luciole_KickStage_0625]:NEEDS[zRealPlume,SmokeScreen,Luciole,!Waterfall]
 {
   !EFFECTS {}
     @MODULE[ModuleEngines*]
@@ -130,7 +130,7 @@
     plumeScale = 0.1
     }
 }
-@PART[_Luciole_KickStage_0625]:NEEDS[zRealPlume,SmokeScreen,Luciole]:AFTER[zzRealPlume]
+@PART[_Luciole_KickStage_0625]:NEEDS[zRealPlume,SmokeScreen,Luciole,!Waterfall]:AFTER[zzRealPlume]
 {
   @EFFECTS
   {
@@ -154,7 +154,7 @@
   }
 }
 
-@PART[_Luciole_Aerospike_0625]:NEEDS[zRealPlume,SmokeScreen,Luciole]
+@PART[_Luciole_Aerospike_0625]:NEEDS[zRealPlume,SmokeScreen,Luciole,!Waterfall]
 {
 	@MODULE[ModuleEngines*]
 	{
@@ -184,7 +184,7 @@
 		blazeScale = 0.5
 	}
 }
-@PART[_Luciole_Aerospike_0625]:NEEDS[zRealPlume,SmokeScreen,Luciole]:AFTER[zzRealPlume]
+@PART[_Luciole_Aerospike_0625]:NEEDS[zRealPlume,SmokeScreen,Luciole,!Waterfall]:AFTER[zzRealPlume]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-ar1-1.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-ar1-1.cfg
index 7d75012..6f9a704 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-ar1-1.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-ar1-1.cfg
@@ -1,4 +1,4 @@
-@PART[nflv-engine-ar1-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles] //
+@PART[nflv-engine-ar1-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles,!Waterfall] //
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-ar1c-1.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-ar1c-1.cfg
index cbc46f7..950a511 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-ar1c-1.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-ar1c-1.cfg
@@ -1,4 +1,4 @@
-@PART[nflv-engine-ar1c-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles] //
+@PART[nflv-engine-ar1c-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles,!Waterfall] //
 {
     @MODULE[ModuleEngines*]
     {
@@ -11,7 +11,7 @@
       transformName = thrustTransform
       localRotation = 0,0,0
       localPosition = 0,0,0
-      
+
       emissionMult = 0.75
       alphaMult = 0.8
       saturationMult = 1
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-m1d-1.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-m1d-1.cfg
index 150e348..ca35588 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-m1d-1.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-m1d-1.cfg
@@ -1,4 +1,4 @@
-@PART[nflv-engine-m1d-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles] //
+@PART[nflv-engine-m1d-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles,!Waterfall] //
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-m1d-vac-1.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-m1d-vac-1.cfg
index d9cf338..b828173 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-m1d-vac-1.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-m1d-vac-1.cfg
@@ -1,4 +1,4 @@
-@PART[nflv-engine-m1d-vac-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles]
+@PART[nflv-engine-m1d-vac-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles,!Waterfall]
 {
 		@MODULE[ModuleEngines*]
 		{
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rd701-1.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rd701-1.cfg
index a4199d9..cc0c6aa 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rd701-1.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rd701-1.cfg
@@ -1,4 +1,4 @@
-@PART[nflv-engine-rd701-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles] //
+@PART[nflv-engine-rd701-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles,!Waterfall] //
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rd704-1.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rd704-1.cfg
index d2994da..e3c6710 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rd704-1.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rd704-1.cfg
@@ -1,4 +1,4 @@
-@PART[nflv-engine-rd704-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles] //
+@PART[nflv-engine-rd704-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles,!Waterfall] //
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rs84-1.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rs84-1.cfg
index e9d27c3..61d8016 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rs84-1.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rs84-1.cfg
@@ -1,4 +1,4 @@
-@PART[nflv-engine-rs84-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles] //
+@PART[nflv-engine-rs84-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles,!Waterfall] //
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rutherford-1.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rutherford-1.cfg
index e43d4e1..9ee8bc5 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rutherford-1.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rutherford-1.cfg
@@ -1,4 +1,4 @@
-@PART[nflv-engine-rutherford-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles] //
+@PART[nflv-engine-rutherford-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles,!Waterfall] //
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rutherford-vac-1.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rutherford-vac-1.cfg
index 2d7b253..6b74c2b 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rutherford-vac-1.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-rutherford-vac-1.cfg
@@ -1,4 +1,4 @@
-@PART[nflv-engine-rutherford-vac-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles]
+@PART[nflv-engine-rutherford-vac-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles,!Waterfall]
 {
 		@MODULE[ModuleEngines*]
 		{
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-stbe-kero-1.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-stbe-kero-1.cfg
index 380a923..3a9e7d6 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-stbe-kero-1.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-stbe-kero-1.cfg
@@ -1,4 +1,4 @@
-@PART[nflv-engine-stbe-kero-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles] //
+@PART[nflv-engine-stbe-kero-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles,!Waterfall] //
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-tr107-1.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-tr107-1.cfg
index 6d503bd..7fd4267 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-tr107-1.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/NFLV/nflv-engine-tr107-1.cfg
@@ -1,4 +1,4 @@
-@PART[nflv-engine-tr107-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles] //
+@PART[nflv-engine-tr107-1]:NEEDS[SmokeScreen,RealPlume,NearFutureLaunchVehicles,!Waterfall] //
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/engine-lfo-25-1.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/engine-lfo-25-1.cfg
index 8aeedfc..c2b41a3 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/engine-lfo-25-1.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/engine-lfo-25-1.cfg
@@ -1,4 +1,4 @@
-@PART[engine-lfo-25-1]:FOR[RealPlume]:NEEDS[SmokeScreen] // RE-4 'Buzzard' Liquid Fuel Engine
+@PART[engine-lfo-25-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // RE-4 'Buzzard' Liquid Fuel Engine
 {
     PLUME
     {
@@ -13,7 +13,7 @@
         speed = 0.8
         emissionMult = 1
     }
-    
+
     @MODULE[ModuleEngines*]
     {
         %powerEffectName = Hydynelox-A7
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/engine-rocket-pack-1.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/engine-rocket-pack-1.cfg
index c62eb17..7c34c4b 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/engine-rocket-pack-1.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/engine-rocket-pack-1.cfg
@@ -1,4 +1,4 @@
-@PART[engine-rocket-pack-1]:FOR[RealPlume]:NEEDS[SmokeScreen] // 64-8S Chickadee
+@PART[engine-rocket-pack-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // 64-8S Chickadee
 {
     @MODULE[ModuleEngines*]
     {
@@ -24,7 +24,7 @@
 				streamScale = 0.1
 	}
 }
-@PART[engine-rocket-pack-1]:AFTER[zzRealPlume]:NEEDS[ReStock]
+@PART[engine-rocket-pack-1]:AFTER[zzRealPlume]:NEEDS[ReStock,!Waterfall]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/engine-rocket-pack-2.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/engine-rocket-pack-2.cfg
index e62a1b5..3038208 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/engine-rocket-pack-2.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/engine-rocket-pack-2.cfg
@@ -1,4 +1,4 @@
-@PART[engine-rocket-pack-2]:FOR[RealPlume]:NEEDS[SmokeScreen] // 96-8S Hummingbird
+@PART[engine-rocket-pack-2]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // 96-8S Hummingbird
 {
     @MODULE[ModuleEngines*]
     {
@@ -24,7 +24,7 @@
 				streamScale = 0.1
 	}
 }
-@PART[engine-rocket-pack-2]:AFTER[zzRealPlume]:NEEDS[ReStock]
+@PART[engine-rocket-pack-2]:AFTER[zzRealPlume]:NEEDS[ReStock,!Waterfall]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/ionArgon-0625-2.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/ionArgon-0625-2.cfg
index de50675..c4e16be 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/ionArgon-0625-2.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/ionArgon-0625-2.cfg
@@ -1,4 +1,4 @@
-@PART[ionArgon-0625-2]:FOR[RealPlume]:NEEDS[SmokeScreen] // GW7201 'Gyro-2' Lensed Hall Thruster
+@PART[ionArgon-0625-2]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // GW7201 'Gyro-2' Lensed Hall Thruster
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/ionArgon-0625-3.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/ionArgon-0625-3.cfg
index 245e2ed..12e391f 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/ionArgon-0625-3.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/ionArgon-0625-3.cfg
@@ -1,4 +1,4 @@
-@PART[ionArgon-0625-3]:FOR[RealPlume]:NEEDS[SmokeScreen] // GW3 'Triplet' Nested-Channel Hall Thruster
+@PART[ionArgon-0625-3]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // GW3 'Triplet' Nested-Channel Hall Thruster
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/ionArgon-0625.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/ionArgon-0625.cfg
index 1b48e26..eee8167 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/ionArgon-0625.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/ionArgon-0625.cfg
@@ -1,4 +1,4 @@
-@PART[ionArgon-0625]:FOR[RealPlume]:NEEDS[SmokeScreen] // GW0101 'Gyro-1' Hall Thruster
+@PART[ionArgon-0625]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // GW0101 'Gyro-1' Hall Thruster
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/ionXenon-0625-2.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/ionXenon-0625-2.cfg
index d982e30..9f37909 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/ionXenon-0625-2.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/ionXenon-0625-2.cfg
@@ -1,4 +1,4 @@
-@PART[ionXenon-0625-2]:FOR[RealPlume]:NEEDS[SmokeScreen] // FI-1124 'HI-SNAP' Ion Thruster
+@PART[ionXenon-0625-2]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // FI-1124 'HI-SNAP' Ion Thruster
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/ionXenon-0625-3.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/ionXenon-0625-3.cfg
index 0bed5b8..35e94b5 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/ionXenon-0625-3.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/ionXenon-0625-3.cfg
@@ -1,4 +1,4 @@
-@PART[ionXenon-0625-3]:FOR[RealPlume]:NEEDS[SmokeScreen] // FI-2154 'Jewel-4' Gridded Ion Thruster
+@PART[ionXenon-0625-3]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // FI-2154 'Jewel-4' Gridded Ion Thruster
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/ionXenon-0625.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/ionXenon-0625.cfg
index 3103560..447a08e 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/ionXenon-0625.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/ionXenon-0625.cfg
@@ -1,4 +1,4 @@
-@PART[ionXenon-0625]:FOR[RealPlume]:NEEDS[SmokeScreen] // IX-8219 'AFTER' Ion Thruster
+@PART[ionXenon-0625]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // IX-8219 'AFTER' Ion Thruster
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/mpdt-0625.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/mpdt-0625.cfg
index 30ea990..7d19b7a 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/mpdt-0625.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/mpdt-0625.cfg
@@ -1,4 +1,4 @@
-@PART[mpdt-0625]:FOR[RealPlume]:NEEDS[SmokeScreen] // LF-1 'Charon' MagnetoPlasmaDynamic Thruster
+@PART[mpdt-0625]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // LF-1 'Charon' MagnetoPlasmaDynamic Thruster
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/mpdt-125.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/mpdt-125.cfg
index 0600d28..74cb503 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/mpdt-125.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/mpdt-125.cfg
@@ -1,4 +1,4 @@
-@PART[mpdt-125]:FOR[RealPlume]:NEEDS[SmokeScreen] // LF-2 'Pytrios' MagnetoPlasmaDynamic Thruster
+@PART[mpdt-125]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // LF-2 'Pytrios' MagnetoPlasmaDynamic Thruster
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/mpdt-25.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/mpdt-25.cfg
index 7fcdc39..195bf87 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/mpdt-25.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/mpdt-25.cfg
@@ -1,4 +1,4 @@
-@PART[mpdt-25]:FOR[RealPlume]:NEEDS[SmokeScreen] // LF-9 'Colossus' Magnetoplasmadyanmic Engine
+@PART[mpdt-25]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // LF-9 'Colossus' Magnetoplasmadyanmic Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/orbital-engine-125.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/orbital-engine-125.cfg
index a2b357c..2d6b8e9 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/orbital-engine-125.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/orbital-engine-125.cfg
@@ -1,4 +1,4 @@
-@PART[orbital-engine-125]:FOR[RealPlume]:NEEDS[SmokeScreen] // LV-601 Oribital Maneuvering Engine
+@PART[orbital-engine-125]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // LV-601 Oribital Maneuvering Engine
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/orbitalEngine-0625.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/orbitalEngine-0625.cfg
index bbf49a5..9f22199 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/orbitalEngine-0625.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/orbitalEngine-0625.cfg
@@ -1,4 +1,4 @@
-@PART[orbital-engine-0625]:FOR[RealPlume]:NEEDS[SmokeScreen] // LV-95 Orbital Maneuvering Engine
+@PART[orbital-engine-0625]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // LV-95 Orbital Maneuvering Engine
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/orbitalEngine-25.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/orbitalEngine-25.cfg
index c866291..2e1fe35 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/orbitalEngine-25.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/orbitalEngine-25.cfg
@@ -1,4 +1,4 @@
-@PART[orbital-engine-25]:FOR[RealPlume]:NEEDS[SmokeScreen] // LV-95-6 Orbital Maneuvering Engine Assembly
+@PART[orbital-engine-25]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // LV-95-6 Orbital Maneuvering Engine Assembly
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/orbitalEngine-375.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/orbitalEngine-375.cfg
index 85ff005..44ed36f 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/orbitalEngine-375.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/orbitalEngine-375.cfg
@@ -1,4 +1,4 @@
-@PART[orbital-engine-375]:FOR[RealPlume]:NEEDS[SmokeScreen] // LV-601-4 Orbital Maneuvering Engine Cluster
+@PART[orbital-engine-375]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // LV-601-4 Orbital Maneuvering Engine Cluster
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/pit-0625.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/pit-0625.cfg
index c5b00dd..1a53df8 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/pit-0625.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/pit-0625.cfg
@@ -1,4 +1,4 @@
-@PART[pit-0625]:FOR[RealPlume]:NEEDS[SmokeScreen] // KP-01 'Scintillator' Pulsed Inductive Thruster
+@PART[pit-0625]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // KP-01 'Scintillator' Pulsed Inductive Thruster
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/pit-125.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/pit-125.cfg
index d36fa23..17503d0 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/pit-125.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/pit-125.cfg
@@ -1,4 +1,4 @@
-@PART[pit-125]:FOR[RealPlume]:NEEDS[SmokeScreen] // KP-XL 'Inductor' Pulsed Inductive Thruster
+@PART[pit-125]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // KP-XL 'Inductor' Pulsed Inductive Thruster
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/pit-25.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/pit-25.cfg
index 1eb2436..b1fe745 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/pit-25.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/pit-25.cfg
@@ -1,4 +1,4 @@
-@PART[pit-25]:FOR[RealPlume]:NEEDS[SmokeScreen] // KX-XK 'Repulsor' Pulsed Inductive Thruster
+@PART[pit-25]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // KX-XK 'Repulsor' Pulsed Inductive Thruster
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/vasimr-0625.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/vasimr-0625.cfg
index 1be546a..dbe626b 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/vasimr-0625.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/vasimr-0625.cfg
@@ -1,4 +1,4 @@
-@PART[vasimr-0625]:FOR[RealPlume]:NEEDS[SmokeScreen] // VX-100 'Hellcon' VASIMR Plasma Thruster
+@PART[vasimr-0625]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // VX-100 'Hellcon' VASIMR Plasma Thruster
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/vasimr-125.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/vasimr-125.cfg
index 75cf5f2..08a10c0 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/vasimr-125.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/vasimr-125.cfg
@@ -1,4 +1,4 @@
-@PART[vasimr-125]:FOR[RealPlume]:NEEDS[SmokeScreen] // VW-200 'Magnotron' VASIMR Plasma Thruster
+@PART[vasimr-125]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // VW-200 'Magnotron' VASIMR Plasma Thruster
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/NearFutureTechnologies/vasimr-25.cfg b/GameData/RealPlume-Stock/NearFutureTechnologies/vasimr-25.cfg
index 5c08f66..ba8d826 100644
--- a/GameData/RealPlume-Stock/NearFutureTechnologies/vasimr-25.cfg
+++ b/GameData/RealPlume-Stock/NearFutureTechnologies/vasimr-25.cfg
@@ -1,4 +1,4 @@
-@PART[vasimr-25]:FOR[RealPlume]:NEEDS[SmokeScreen] // VW-10K 'Cyclotron' VASIMR Plama Engine
+@PART[vasimr-25]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // VW-10K 'Cyclotron' VASIMR Plama Engine
 {
     PLUME
     {
@@ -21,7 +21,7 @@
       name = VASIMIR_Xenon
       transformName = thrustTransform
       localRotation = 0,0,0
-      
+
       emissionMult = 1
       fixedScale = 1
       energy = 1
diff --git a/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineKE-1.cfg b/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineKE-1.cfg
index 8138edc..e004b0a 100644
--- a/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineKE-1.cfg
+++ b/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineKE-1.cfg
@@ -1,8 +1,8 @@
-@PART[LiquidEngineKE-1]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[LiquidEngineKE-1]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[LiquidEngineKE-1]:NEEDS[SmokeScreen,ReStock] // Kerbodyne KE-1 'Mastodon' Liquid Fuel Engine
+@PART[LiquidEngineKE-1]:NEEDS[SmokeScreen,ReStock,!WaterfallRestock] // Kerbodyne KE-1 'Mastodon' Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRE-I2_Skiff.cfg b/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRE-I2_Skiff.cfg
index bf0d304..8ed0934 100644
--- a/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRE-I2_Skiff.cfg
+++ b/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRE-I2_Skiff.cfg
@@ -1,8 +1,8 @@
-@PART[LiquidEngineRE-I2]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[LiquidEngineRE-I2]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[LiquidEngineRE-I2]:NEEDS[zRealPlume,SmokeScreen,ReStock]//RE-I2 'Skiff' Liquid Fuel Engine
+@PART[LiquidEngineRE-I2]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]//RE-I2 'Skiff' Liquid Fuel Engine
 {
       @MODULE[ModuleEngines*]
       {
diff --git a/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRE-J10_Wolfhound.cfg b/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRE-J10_Wolfhound.cfg
index 3600850..c80b309 100644
--- a/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRE-J10_Wolfhound.cfg
+++ b/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRE-J10_Wolfhound.cfg
@@ -1,8 +1,8 @@
-@PART[LiquidEngineRE-J10]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[LiquidEngineRE-J10]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[LiquidEngineRE-J10]:NEEDS[zRealPlume,SmokeScreen,ReStock]// RE-J10 'Wolfhound'  Liquid Fuel Engine
+@PART[LiquidEngineRE-J10]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]// RE-J10 'Wolfhound'  Liquid Fuel Engine
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRK-7_Kodiak.cfg b/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRK-7_Kodiak.cfg
index fcae7dc..aa1cb44 100644
--- a/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRK-7_Kodiak.cfg
+++ b/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRK-7_Kodiak.cfg
@@ -1,8 +1,8 @@
-@PART[LiquidEngineRK-7]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[LiquidEngineRK-7]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[LiquidEngineRK-7]:NEEDS[zRealPlume,SmokeScreen,ReStock]
+@PART[LiquidEngineRK-7]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]
 {
 		@MODULE[ModuleEngines*]
 		{
@@ -31,7 +31,7 @@
 		}
 }
 //Custom adjustments to account for differing plume behaviour as ReStock FX transforms use Y+ axis.
-@PART[LiquidEngineRK-7]:AFTER[zzRealPlume]:NEEDS[ReStock]
+@PART[LiquidEngineRK-7]:AFTER[zzRealPlume]:NEEDS[ReStock,!WaterfallRestock]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRV-1_Cub.cfg b/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRV-1_Cub.cfg
index 692af3b..fdd5659 100644
--- a/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRV-1_Cub.cfg
+++ b/GameData/RealPlume-Stock/ReStock/MH_LiquidEngineRV-1_Cub.cfg
@@ -1,8 +1,8 @@
-@PART[LiquidEngineRV-1]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[LiquidEngineRV-1]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[LiquidEngineRV-1]:NEEDS[zRealPlume,SmokeScreen,ReStock] // RV-1 'Cub' Vernier Engine
+@PART[LiquidEngineRV-1]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock] // RV-1 'Cub' Vernier Engine
 {
     PLUME
     {
@@ -29,7 +29,7 @@
     }
 }
 //Custom adjustments to account for differing plume behaviour as ReStock FX transforms use Y+ axis.
-@PART[LiquidEngineRV-1]:AFTER[zzRealPlume]:NEEDS[ReStock]
+@PART[LiquidEngineRV-1]:AFTER[zzRealPlume]:NEEDS[ReStock,!WaterfallRestock]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/ReStock/RAPIER_Old.txt b/GameData/RealPlume-Stock/ReStock/RAPIER_Old.txt
new file mode 100644
index 0000000..28100c4
--- /dev/null
+++ b/GameData/RealPlume-Stock/ReStock/RAPIER_Old.txt
@@ -0,0 +1,43 @@
+// If the fancy Rapier plume causes low fps for you, please delete RAPIER.cfg and rename this file from RAPIER_OLD.txt to RAPIER_OLD.cfg
+//A similar option is available for Stock as well in Squad folder
+
+@PART[RAPIER]:NEEDS[ReStock]:AFTER[ReStock]
+{
+  !EFFECTS {}
+}
+@PART[RAPIER]:NEEDS[zRealPlume,SmokeScreen,ReStock] // CR-7 R.A.P.I.E.R. Engine
+{
+    PLUME
+    {
+        name = Turbojet
+        transformName = thrustTransform
+        localRotation = 0,0,0
+        localPosition = 0,0,-0.4
+        fixedScale = 0.7
+        energy = 0.8
+        speed = 1
+        emissionMult = 1.0
+    }
+    PLUME
+    {
+        name = Hypergolic-Lower
+        transformName = thrustTransform
+        localRotation = 0,0,0
+        plumePosition = 0,0,0
+        flarePosition = 0,0,0.3
+        plumeScale = 0.4
+        flareScale = 0.4
+        energy = 1
+        speed = 1
+        emissionMult = 1.0
+    }
+    @MODULE[ModuleEngines*],0
+    {
+        %powerEffectName = Turbojet
+        %spoolEffectName = Turbojet-Spool
+    }
+    @MODULE[ModuleEngines*],1
+    {
+        %powerEffectName = Hypergolic-Lower
+    }
+}
diff --git a/GameData/RealPlume-Stock/ReStock/Size2LFB_TwinBoar.cfg b/GameData/RealPlume-Stock/ReStock/Size2LFB_TwinBoar.cfg
index c82052a..90b36e8 100644
--- a/GameData/RealPlume-Stock/ReStock/Size2LFB_TwinBoar.cfg
+++ b/GameData/RealPlume-Stock/ReStock/Size2LFB_TwinBoar.cfg
@@ -1,8 +1,8 @@
-@PART[Size2LFB]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[Size2LFB]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[Size2LFB]:NEEDS[zRealPlume,SmokeScreen,ReStock]
+@PART[Size2LFB]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]
 {
 
 		@MODULE[ModuleEngines*]
@@ -33,7 +33,7 @@
 		}
 
 }
-@PART[Size2LFB]:AFTER[zzRealPlume]:NEEDS[ReStock]
+@PART[Size2LFB]:AFTER[zzRealPlume]:NEEDS[ReStock,!WaterfallRestock]
 {
   @EFFECTS
   {
@@ -49,7 +49,7 @@
 
 
 //TurboExhaust
-@PART[Size2LFB]:AFTER[zRealPlume]:NEEDS[ReStock]
+@PART[Size2LFB]:AFTER[zRealPlume]:NEEDS[ReStock,!WaterfallRestock]
 {
 	%EFFECTS
     {
diff --git a/GameData/RealPlume-Stock/ReStock/Size3AdvancedEngine_Rhino.cfg b/GameData/RealPlume-Stock/ReStock/Size3AdvancedEngine_Rhino.cfg
index 4fdfd13..0b69cdb 100644
--- a/GameData/RealPlume-Stock/ReStock/Size3AdvancedEngine_Rhino.cfg
+++ b/GameData/RealPlume-Stock/ReStock/Size3AdvancedEngine_Rhino.cfg
@@ -1,8 +1,8 @@
-@PART[Size3AdvancedEngine]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[Size3AdvancedEngine]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[Size3AdvancedEngine]:NEEDS[zRealPlume,SmokeScreen,ReStock]
+@PART[Size3AdvancedEngine]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]
 {
 
 			@MODULE[ModuleEngines*]
@@ -31,7 +31,7 @@
       plume2Scale = 1.7
       }
 }
-@PART[Size3AdvancedEngine]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[Size3AdvancedEngine]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/ReStock/Size3EngineCluster_Mammoth.cfg b/GameData/RealPlume-Stock/ReStock/Size3EngineCluster_Mammoth.cfg
index a57c44a..a025b0f 100644
--- a/GameData/RealPlume-Stock/ReStock/Size3EngineCluster_Mammoth.cfg
+++ b/GameData/RealPlume-Stock/ReStock/Size3EngineCluster_Mammoth.cfg
@@ -1,8 +1,8 @@
-@PART[Size3EngineCluster]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[Size3EngineCluster]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[Size3EngineCluster]:NEEDS[zRealPlume,SmokeScreen,ReStock]
+@PART[Size3EngineCluster]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]
 {
 
       @MODULE[ModuleEngines*]
diff --git a/GameData/RealPlume-Stock/ReStock/engineLargeSkipper.cfg b/GameData/RealPlume-Stock/ReStock/engineLargeSkipper.cfg
index b9b4db1..5370c04 100644
--- a/GameData/RealPlume-Stock/ReStock/engineLargeSkipper.cfg
+++ b/GameData/RealPlume-Stock/ReStock/engineLargeSkipper.cfg
@@ -2,7 +2,7 @@
 {
   !EFFECTS {}
 }
-@PART[engineLargeSkipper]:NEEDS[zRealPlume,SmokeScreen,ReStock]
+@PART[engineLargeSkipper]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]
 {
       @MODULE[ModuleEngines*]
       {
diff --git a/GameData/RealPlume-Stock/ReStock/engineLargeSkipper_v2.cfg b/GameData/RealPlume-Stock/ReStock/engineLargeSkipper_v2.cfg
index 457d921..752bc49 100644
--- a/GameData/RealPlume-Stock/ReStock/engineLargeSkipper_v2.cfg
+++ b/GameData/RealPlume-Stock/ReStock/engineLargeSkipper_v2.cfg
@@ -2,7 +2,7 @@
 {
   !EFFECTS {}
 }
-@PART[engineLargeSkipper_v2]:NEEDS[zRealPlume,SmokeScreen,ReStock]
+@PART[engineLargeSkipper_v2]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]
 {
       @MODULE[ModuleEngines*]
       {
diff --git a/GameData/RealPlume-Stock/ReStock/ionEngine_Dawn.cfg b/GameData/RealPlume-Stock/ReStock/ionEngine_Dawn.cfg
index 1c6bf59..7153870 100644
--- a/GameData/RealPlume-Stock/ReStock/ionEngine_Dawn.cfg
+++ b/GameData/RealPlume-Stock/ReStock/ionEngine_Dawn.cfg
@@ -1,4 +1,4 @@
-@PART[ionEngine]:AFTER[ReStock]
+@PART[ionEngine]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
@@ -21,4 +21,3 @@
         %powerEffectName = Ion_Xenon_Gridded_NFP
     }
 }
-:NEEDS[ReStock]:AFTER[ReStock]
diff --git a/GameData/RealPlume-Stock/ReStock/liquidEngine1-2_Mainsail.cfg b/GameData/RealPlume-Stock/ReStock/liquidEngine1-2_Mainsail.cfg
index 8d450ce..b04b649 100644
--- a/GameData/RealPlume-Stock/ReStock/liquidEngine1-2_Mainsail.cfg
+++ b/GameData/RealPlume-Stock/ReStock/liquidEngine1-2_Mainsail.cfg
@@ -1,8 +1,8 @@
-@PART[liquidEngine1-2]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[liquidEngine1-2]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[liquidEngine1-2]:NEEDS[zRealPlume,SmokeScreen,ReStock]//Mainsail
+@PART[liquidEngine1-2]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]//Mainsail
 {
 		@MODULE[ModuleEngines*]
 		{
@@ -31,7 +31,7 @@
 		}
 }
 //Custom adjustments to account for differing plume behaviour as ReStock FX transforms use Y+ axis.
-@PART[liquidEngine1-2]:AFTER[zzRealPlume]:NEEDS[ReStock]
+@PART[liquidEngine1-2]:AFTER[zzRealPlume]:NEEDS[ReStock,!WaterfallRestock]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/ReStock/liquidEngine2-2_v2_Poodle.cfg b/GameData/RealPlume-Stock/ReStock/liquidEngine2-2_v2_Poodle.cfg
index 6e6ae2b..5ee07f8 100644
--- a/GameData/RealPlume-Stock/ReStock/liquidEngine2-2_v2_Poodle.cfg
+++ b/GameData/RealPlume-Stock/ReStock/liquidEngine2-2_v2_Poodle.cfg
@@ -1,8 +1,8 @@
-@PART[liquidEngine2-2_v2]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[liquidEngine2-2_v2]:NEEDS[zRealPlume,ReStock,SmokeScreen,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[liquidEngine2-2_v2]:NEEDS[zRealPlume,ReStock,SmokeScreen]
+@PART[liquidEngine2-2_v2]:NEEDS[zRealPlume,ReStock,SmokeScreen,!WaterfallRestock]
 {
 		@MODULE[ModuleEngines*]
 		{
@@ -29,7 +29,7 @@
 		plumeScale = 1
 		}
 }
-@PART[liquidEngine2-2_v2]:AFTER[zzRealPlume]:NEEDS[ReStock]
+@PART[liquidEngine2-2_v2]:AFTER[zzRealPlume]:NEEDS[ReStock,!WaterfallRestock]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/ReStock/liquidEngine2_Swivel.cfg b/GameData/RealPlume-Stock/ReStock/liquidEngine2_Swivel.cfg
index 3866f2e..20713ec 100644
--- a/GameData/RealPlume-Stock/ReStock/liquidEngine2_Swivel.cfg
+++ b/GameData/RealPlume-Stock/ReStock/liquidEngine2_Swivel.cfg
@@ -1,8 +1,8 @@
-@PART[liquidEngine2]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[liquidEngine2]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[liquidEngine2]:NEEDS[zRealPlume,SmokeScreen,ReStock]
+@PART[liquidEngine2]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]
 {
   PLUME
   {
diff --git a/GameData/RealPlume-Stock/ReStock/liquidEngine3_v2_Terrier.cfg b/GameData/RealPlume-Stock/ReStock/liquidEngine3_v2_Terrier.cfg
index 568a559..677be4d 100644
--- a/GameData/RealPlume-Stock/ReStock/liquidEngine3_v2_Terrier.cfg
+++ b/GameData/RealPlume-Stock/ReStock/liquidEngine3_v2_Terrier.cfg
@@ -1,8 +1,8 @@
-@PART[liquidEngine3_v2]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[liquidEngine3_v2]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[liquidEngine3_v2]:NEEDS[zRealPlume,SmokeScreen,ReStock]
+@PART[liquidEngine3_v2]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/ReStock/liquidEngineMainsail_v2.cfg b/GameData/RealPlume-Stock/ReStock/liquidEngineMainsail_v2.cfg
index 0aabe10..0d06db4 100644
--- a/GameData/RealPlume-Stock/ReStock/liquidEngineMainsail_v2.cfg
+++ b/GameData/RealPlume-Stock/ReStock/liquidEngineMainsail_v2.cfg
@@ -2,7 +2,7 @@
 {
   !EFFECTS {}
 }
-@PART[liquidEngineMainsail_v2]:NEEDS[zRealPlume,SmokeScreen,ReStock]//Mainsail
+@PART[liquidEngineMainsail_v2]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]//Mainsail
 {
 		@MODULE[ModuleEngines*]
 		{
@@ -31,7 +31,7 @@
 		}
 }
 //Custom adjustments to account for differing plume behaviour as ReStock FX transforms use Y+ axis.
-@PART[liquidEngineMainsail_v2]:AFTER[zzRealPlume]:NEEDS[ReStock]
+@PART[liquidEngineMainsail_v2]:AFTER[zzRealPlume]:NEEDS[ReStock,!WaterfallRestock]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/ReStock/liquidEngineMini_v2_Spark.cfg b/GameData/RealPlume-Stock/ReStock/liquidEngineMini_v2_Spark.cfg
index 6912122..a98dcc2 100644
--- a/GameData/RealPlume-Stock/ReStock/liquidEngineMini_v2_Spark.cfg
+++ b/GameData/RealPlume-Stock/ReStock/liquidEngineMini_v2_Spark.cfg
@@ -2,7 +2,7 @@
 {
   !EFFECTS {}
 }
-@PART[liquidEngineMini_v2]:NEEDS[zRealPlume,SmokeScreen,ReStock]
+@PART[liquidEngineMini_v2]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]
 {
 		@MODULE[ModuleEngines*]
 		{
@@ -30,7 +30,7 @@
 		}
 }
 //Custom adjustments to account for differing plume behaviour as ReStock FX transforms use Y+ axis.
-@PART[liquidEngineMini_v2]:AFTER[zzRealPlume]:NEEDS[ReStock]
+@PART[liquidEngineMini_v2]:AFTER[zzRealPlume]:NEEDS[ReStock,!WaterfallRestock]
 {
   @EFFECTS
   {
@@ -43,7 +43,7 @@
 		}
   }
 }
-@PART[liquidEngineMini_v2]:AFTER[zzRealPlume]:NEEDS[ReStock]
+@PART[liquidEngineMini_v2]:AFTER[zzRealPlume]:NEEDS[ReStock,!WaterfallRestock]
 {
   @EFFECTS
   {
@@ -70,7 +70,7 @@
 }
 
 //Gas generator effect
-@PART[liquidEngineMini_v2]:AFTER[zzRealPlume]:NEEDS[zRealPlume,SmokeScreen,ReStock]
+@PART[liquidEngineMini_v2]:AFTER[zzRealPlume]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]
 {
 	%EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/ReStock/liquidEngineSSME_Vector.cfg b/GameData/RealPlume-Stock/ReStock/liquidEngineSSME_Vector.cfg
index 3ac63d6..fb36b08 100644
--- a/GameData/RealPlume-Stock/ReStock/liquidEngineSSME_Vector.cfg
+++ b/GameData/RealPlume-Stock/ReStock/liquidEngineSSME_Vector.cfg
@@ -1,8 +1,8 @@
-@PART[SSME]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[SSME]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[SSME]:NEEDS[zRealPlume,SmokeScreen,ReStock]
+@PART[SSME]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]
 {
       @MODULE[ModuleEngines*]
       {
diff --git a/GameData/RealPlume-Stock/ReStock/liquidEngine_reliant.cfg b/GameData/RealPlume-Stock/ReStock/liquidEngine_reliant.cfg
index 6846fd0..eb25441 100644
--- a/GameData/RealPlume-Stock/ReStock/liquidEngine_reliant.cfg
+++ b/GameData/RealPlume-Stock/ReStock/liquidEngine_reliant.cfg
@@ -1,8 +1,8 @@
-@PART[liquidEngine]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[liquidEngine]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[liquidEngine]:NEEDS[zRealPlume,SmokeScreen,ReStock]
+@PART[liquidEngine]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock]
 {
     @MODULE[ModuleEngines*]
     {
@@ -31,7 +31,7 @@
     }
 }
 //Patch in turbo exhaust and remove offset effects.
-@PART[liquidEngine]:AFTER[zzRealPlume]:NEEDS[ReStock]
+@PART[liquidEngine]:AFTER[zzRealPlume]:NEEDS[ReStock,!WaterfallRestock]
 {
 	@EFFECTS
     {
@@ -129,8 +129,7 @@
 		}
 	}
 }
-@PART[liquidEngine]:AFTER[zzRealPlume]:NEEDS[ReStock]
-{
+@PART[liquidEngine]:AFTER[zzRealPlume]:NEEDS[ReStock,!WaterfallRestock]
   @EFFECTS
   {
     @Kerolox_LowerAlt
diff --git a/GameData/RealPlume-Stock/ReStock/microEngine_v2_Ant.cfg b/GameData/RealPlume-Stock/ReStock/microEngine_v2_Ant.cfg
index dbb27ec..7433820 100644
--- a/GameData/RealPlume-Stock/ReStock/microEngine_v2_Ant.cfg
+++ b/GameData/RealPlume-Stock/ReStock/microEngine_v2_Ant.cfg
@@ -1,8 +1,8 @@
-@PART[microEngine_v2]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[microEngine_v2]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[microEngine_v2]:NEEDS[zRealPlume,SmokeScreen,ReStock] // LV-1 "Ant" Liquid Fuel Engine
+@PART[microEngine_v2]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock] // LV-1 "Ant" Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/ReStock/nuclearEngine_NERV.cfg b/GameData/RealPlume-Stock/ReStock/nuclearEngine_NERV.cfg
index afe8acf..00008d3 100644
--- a/GameData/RealPlume-Stock/ReStock/nuclearEngine_NERV.cfg
+++ b/GameData/RealPlume-Stock/ReStock/nuclearEngine_NERV.cfg
@@ -1,9 +1,9 @@
-@PART[nuclearEngine]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[nuclearEngine]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
 //Patch for ReStock NERV without Kerbal Atomics Installed
-@PART[nuclearEngine]:NEEDS[zRealPlume,SmokeScreen,ReStock,!KerbalAtomics] // LV-N "Nerv" Atomic Rocket Motor
+@PART[nuclearEngine]:NEEDS[RealPlume,SmokeScreen,ReStock,!KerbalAtomics,!WaterfallRestock] // LV-N "Nerv" Atomic Rocket Motor
 {
     PLUME
     {
@@ -32,7 +32,7 @@
     }
 }
 //Vernier FX
-@PART[nuclearEngine]:NEEDS[zRealPlume,SmokeScreen,ReStock,!KerbalAtomics]:FOR[zzRealPlume]
+@PART[nuclearEngine]:NEEDS[RealPlume,SmokeScreen,ReStock,!KerbalAtomics,!WaterfallRestock]:FOR[zzRealPlume]
 {
   @EFFECTS
   {
@@ -81,7 +81,7 @@
 }
 
 //Patch for ReStock NERV with Kerbal Atomics and nucelar engines use LF patch Installed
-@PART[nuclearEngine]:NEEDS[zRealPlume,SmokeScreen,ReStock,KerbalAtomics,NTRsUseLF] // LV-N "Nerv" Atomic Rocket Motor
+@PART[nuclearEngine]:NEEDS[RealPlume,SmokeScreen,ReStock,KerbalAtomics,NTRsUseLF,!WaterfallRestock] // LV-N "Nerv" Atomic Rocket Motor
 {
     PLUME
     {
@@ -110,7 +110,7 @@
     }
 }
 //Vernier FX
-@PART[nuclearEngine]:NEEDS[zRealPlume,SmokeScreen,ReStock,KerbalAtomics,NTRsUseLF]:FOR[zzRealPlume]
+@PART[nuclearEngine]:NEEDS[RealPlume,SmokeScreen,ReStock,KerbalAtomics,NTRsUseLF,!WaterfallRestock]:FOR[zzRealPlume]
 {
   @EFFECTS
   {
@@ -161,7 +161,7 @@
 //Patch for ReStock NERV with Kerbal atomics installed and no NTR uses LF patch.
 // at AFTER:[zKerbalAtomics] KA makes NERV multimode so that it has LF and LH2 modes. It also inserts dedicated plume effects at this point.
 // This patch runs after that and manually creates the plume as normal RealPlume patching would attempt to make the plume at FOR:[zRealPlume]
-@PART[nuclearEngine]:NEEDS[RealPlume,SmokeScreen,KerbalAtomics,ReStock,!NTRsUseLF]:FOR[zzKerbalAtomics] // LV-N "Nerv" Atomic Rocket Motor
+@PART[nuclearEngine]:NEEDS[RealPlume,SmokeScreen,KerbalAtomics,ReStock,!NTRsUseLF,!WaterfallRestock]:FOR[zzKerbalAtomics] // LV-N "Nerv" Atomic Rocket Motor
 {
     @EFFECTS
     {
diff --git a/GameData/RealPlume-Stock/ReStock/omsEngine_Puff.cfg b/GameData/RealPlume-Stock/ReStock/omsEngine_Puff.cfg
index 286be22..0762de6 100644
--- a/GameData/RealPlume-Stock/ReStock/omsEngine_Puff.cfg
+++ b/GameData/RealPlume-Stock/ReStock/omsEngine_Puff.cfg
@@ -1,8 +1,8 @@
-@PART[omsEngine]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[omsEngine]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[omsEngine]:NEEDS[zRealPlume,SmokeScreen,ReStock] // O-10 "Puff" MonoPropellant Fuel Engine
+@PART[omsEngine]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock] // O-10 "Puff" MonoPropellant Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/ReStock/microEngineRadial_Spider.cfg b/GameData/RealPlume-Stock/ReStock/radialEngineMini_v2_spider.cfg
similarity index 67%
rename from GameData/RealPlume-Stock/ReStock/microEngineRadial_Spider.cfg
rename to GameData/RealPlume-Stock/ReStock/radialEngineMini_v2_spider.cfg
index 54de056..d2d8d0f 100644
--- a/GameData/RealPlume-Stock/ReStock/microEngineRadial_Spider.cfg
+++ b/GameData/RealPlume-Stock/ReStock/radialEngineMini_v2_spider.cfg
@@ -1,8 +1,8 @@
-@PART[radialEngineMini_v2]:NEEDS[ReStock]:AFTER[ReStock]
+@PART[radialEngineMini_v2]:NEEDS[ReStock,!WaterfallRestock]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[radialEngineMini_v2]:NEEDS[zRealPlume,SmokeScreen,ReStock] // LV-1R "Spider" Liquid Fuel Engine
+@PART[radialEngineMini_v2]:NEEDS[zRealPlume,SmokeScreen,ReStock,!WaterfallRestock] // LV-1R "Spider" Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/ReStockPlus/Boar.cfg b/GameData/RealPlume-Stock/ReStockPlus/Boar.cfg
index 038d42e..df05f18 100644
--- a/GameData/RealPlume-Stock/ReStockPlus/Boar.cfg
+++ b/GameData/RealPlume-Stock/ReStockPlus/Boar.cfg
@@ -1,4 +1,4 @@
-@PART[restock-engine-boar]:NEEDS[zRealPlume,SmokeScreen]
+@PART[restock-engine-boar]:NEEDS[zRealPlume,SmokeScreen,!WaterfallRestock]
 {
 
 		@MODULE[ModuleEngines*]
@@ -29,7 +29,7 @@
 		}
 
 }
-@PART[Size2LFB]:AFTER[zzRealPlume]:NEEDS[ReStock]
+@PART[Size2LFB]:AFTER[zzRealPlume]:NEEDS[ReStock,!WaterfallRestock]
 {
   @EFFECTS
   {
@@ -44,7 +44,7 @@
 }
 
 //TurboExhaust
-@PART[restock-engine-boar]:AFTER[zRealPlume]
+@PART[restock-engine-boar]:AFTER[zRealPlume]:NEEDS[ReStock,!WaterfallRestock]
 {
 	%EFFECTS
     {
diff --git a/GameData/RealPlume-Stock/ReStockPlus/Caravel.cfg b/GameData/RealPlume-Stock/ReStockPlus/Caravel.cfg
index f0add8a..55f417a 100644
--- a/GameData/RealPlume-Stock/ReStockPlus/Caravel.cfg
+++ b/GameData/RealPlume-Stock/ReStockPlus/Caravel.cfg
@@ -1,4 +1,4 @@
-@PART[restock-engine-caravel-1]:NEEDS[zRealPlume,SmokeScreen]//ReStock+ J2
+@PART[restock-engine-caravel-1]:NEEDS[zRealPlume,SmokeScreen,!WaterfallRestock]//ReStock+ J2
 {
       @MODULE[ModuleEngines*]
       {
diff --git a/GameData/RealPlume-Stock/ReStockPlus/Cherenkov_NTR.cfg b/GameData/RealPlume-Stock/ReStockPlus/Cherenkov_NTR.cfg
index d060a46..b54193e 100644
--- a/GameData/RealPlume-Stock/ReStockPlus/Cherenkov_NTR.cfg
+++ b/GameData/RealPlume-Stock/ReStockPlus/Cherenkov_NTR.cfg
@@ -1,4 +1,4 @@
-@PART[restock-engine-cherenkov]:NEEDS[zRealPlume,SmokeScreen] //
+@PART[restock-engine-cherenkov]:NEEDS[zRealPlume,SmokeScreen,!WaterfallRestock] //
 {
       PLUME
       {
@@ -27,7 +27,7 @@
       }
 }
 
-@PART[restock-engine-cherenkov]:AFTER[zRealPlume]
+@PART[restock-engine-cherenkov]:AFTER[zRealPlume]:NEEDS[RealPlume,SmokeScreen,!WaterfallRestock] //
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/ReStockPlus/Corgi.cfg b/GameData/RealPlume-Stock/ReStockPlus/Corgi.cfg
index 3de9795..dc60175 100644
--- a/GameData/RealPlume-Stock/ReStockPlus/Corgi.cfg
+++ b/GameData/RealPlume-Stock/ReStockPlus/Corgi.cfg
@@ -1,4 +1,4 @@
-@PART[restock-engine-375-corgi]:NEEDS[zRealPlume,SmokeScreen]
+@PART[restock-engine-375-corgi]:NEEDS[zRealPlume,SmokeScreen,!WaterfallRestock]
 {
       @MODULE[ModuleEngines*]
       {
diff --git a/GameData/RealPlume-Stock/ReStockPlus/Panda.cfg b/GameData/RealPlume-Stock/ReStockPlus/Panda.cfg
index f4c4540..8aa2347 100644
--- a/GameData/RealPlume-Stock/ReStockPlus/Panda.cfg
+++ b/GameData/RealPlume-Stock/ReStockPlus/Panda.cfg
@@ -1,4 +1,4 @@
-@PART[restock-engine-panda-1]:NEEDS[zRealPlume,SmokeScreen] //
+@PART[restock-engine-panda-1]:NEEDS[zRealPlume,SmokeScreen,!WaterfallRestock] //
 {
     !EFFECTS {}
     PLUME
@@ -26,7 +26,7 @@
     }
 }
 //Custom adjustments to account for differing plume behaviour as ReStock FX transforms use Y+ axis.
-@PART[restock-engine-panda-1]:AFTER[zzRealPlume]:NEEDS[ReStock]
+@PART[restock-engine-panda-1]:AFTER[zzRealPlume]:NEEDS[ReStock,!WaterfallRestock]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/ReStockPlus/Pug.cfg b/GameData/RealPlume-Stock/ReStockPlus/Pug.cfg
index bc2e6ff..0ea5111 100644
--- a/GameData/RealPlume-Stock/ReStockPlus/Pug.cfg
+++ b/GameData/RealPlume-Stock/ReStockPlus/Pug.cfg
@@ -1,4 +1,4 @@
-@PART[restock-engine-125-pug]:NEEDS[zRealPlume,SmokeScreen]//ReStock plus Pug
+@PART[restock-engine-125-pug]:NEEDS[zRealPlume,SmokeScreen,!WaterfallRestock]//ReStock plus Pug
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/ReStockPlus/Schnauzer.cfg b/GameData/RealPlume-Stock/ReStockPlus/Schnauzer.cfg
index 699c030..4b28845 100644
--- a/GameData/RealPlume-Stock/ReStockPlus/Schnauzer.cfg
+++ b/GameData/RealPlume-Stock/ReStockPlus/Schnauzer.cfg
@@ -1,4 +1,4 @@
-@PART[restock-engine-schnauzer-1]:NEEDS[zRealPlume,SmokeScreen]//ReStock plus Apollo SPS
+@PART[restock-engine-schnauzer-1]:NEEDS[zRealPlume,SmokeScreen,!WaterfallRestock]//ReStock plus Apollo SPS
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/ReStockPlus/Torch.cfg b/GameData/RealPlume-Stock/ReStockPlus/Torch.cfg
index 08de9d5..9537033 100644
--- a/GameData/RealPlume-Stock/ReStockPlus/Torch.cfg
+++ b/GameData/RealPlume-Stock/ReStockPlus/Torch.cfg
@@ -1,4 +1,4 @@
-@PART[restock-engine-torch]:NEEDS[zRealPlume,SmokeScreen]
+@PART[restock-engine-torch]:NEEDS[zRealPlume,SmokeScreen,!WaterfallRestock]
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/ReStockPlus/Ursa.cfg b/GameData/RealPlume-Stock/ReStockPlus/Ursa.cfg
index 436f420..4cd5921 100644
--- a/GameData/RealPlume-Stock/ReStockPlus/Ursa.cfg
+++ b/GameData/RealPlume-Stock/ReStockPlus/Ursa.cfg
@@ -1,4 +1,4 @@
-@PART[restock-engine-ursa-1]:NEEDS[zRealPlume,SmokeScreen]
+@PART[restock-engine-ursa-1]:NEEDS[zRealPlume,SmokeScreen,!WaterfallRestock]
 {
 		!EFFECTS {}
 		@MODULE[ModuleEngines*]
@@ -28,7 +28,7 @@
 		}
 }
 //Custom adjustments to account for differing plume behaviour as ReStock FX transforms use Y+ axis.
-@PART[restock-engine-ursa-1]:AFTER[zzRealPlume]:NEEDS[ReStock]
+@PART[restock-engine-ursa-1]:AFTER[zzRealPlume]:NEEDS[ReStock,!WaterfallRestock]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/ReStockPlus/Valiant.cfg b/GameData/RealPlume-Stock/ReStockPlus/Valiant.cfg
index 1184ce5..98c88b9 100644
--- a/GameData/RealPlume-Stock/ReStockPlus/Valiant.cfg
+++ b/GameData/RealPlume-Stock/ReStockPlus/Valiant.cfg
@@ -1,4 +1,4 @@
-@PART[restock-engine-125-valiant]:NEEDS[zRealPlume,SmokeScreen,ReStockPlus]
+@PART[restock-engine-125-valiant]:NEEDS[zRealPlume,SmokeScreen,ReStockPlus,!WaterfallRestock]
 {
 		@MODULE[ModuleEngines*]
 		{
@@ -27,7 +27,7 @@
 		}
 }
 //Custom adjustments to account for differing plume behaviour as ReStock FX transforms use Y+ axis.
-@PART[restock-engine-125-valiant]:AFTER[zzRealPlume]:NEEDS[ReStock]
+@PART[restock-engine-125-valiant]:AFTER[zzRealPlume]:NEEDS[ReStock,!WaterfallRestock]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/ReStockPlus/restock-engine-galleon-1.cfg b/GameData/RealPlume-Stock/ReStockPlus/restock-engine-galleon-1.cfg
index 2ba0c50..9139f69 100644
--- a/GameData/RealPlume-Stock/ReStockPlus/restock-engine-galleon-1.cfg
+++ b/GameData/RealPlume-Stock/ReStockPlus/restock-engine-galleon-1.cfg
@@ -1,4 +1,4 @@
-@PART[restock-engine-galleon-1]:NEEDS[SmokeScreen,ReStockPlus] // Kerbodyne KE-1 'Mastodon' Liquid Fuel Engine
+@PART[restock-engine-galleon-1]:NEEDS[SmokeScreen,ReStockPlus,!WaterfallRestock] // Kerbodyne KE-1 'Mastodon' Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/RealPlume-Stock.version b/GameData/RealPlume-Stock/RealPlume-Stock.version
index b805471..846b471 100644
--- a/GameData/RealPlume-Stock/RealPlume-Stock.version
+++ b/GameData/RealPlume-Stock/RealPlume-Stock.version
@@ -2,8 +2,8 @@
 "NAME":"RealPlume - Stock","URL":"http://ksp-avc.cybutek.net/version.php?id=281",
 "DOWNLOAD":"https://github.com/KSP-RO/RealPlume-StockConfigs/releases",
 "CHANGE_LOG_URL":"https://github.com/KSP-RO/RealPlume-StockConfigs/wiki/Changelog",
-"VERSION":{"MAJOR":4,"MINOR":0,"PATCH":1,"BUILD":0},
-"KSP_VERSION":{"MAJOR":1,"MINOR":9,"PATCH":1},
+"VERSION":{"MAJOR":4,"MINOR":0,"PATCH":6,"BUILD":0},
+"KSP_VERSION":{"MAJOR":1,"MINOR":11,"PATCH":2},
 "KSP_VERSION_MIN":{"MAJOR":1,"MINOR":8,"PATCH":1},
-"KSP_VERSION_MAX":{"MAJOR":1,"MINOR":9,"PATCH":99}
+"KSP_VERSION_MAX":{"MAJOR":1,"MINOR":12,"PATCH":99}
 }
diff --git a/GameData/RealPlume-Stock/Space Launch System/R4D11.cfg b/GameData/RealPlume-Stock/Space Launch System/R4D11.cfg.off
similarity index 100%
rename from GameData/RealPlume-Stock/Space Launch System/R4D11.cfg
rename to GameData/RealPlume-Stock/Space Launch System/R4D11.cfg.off
diff --git a/GameData/RealPlume-Stock/Squad/RAPIER.cfg b/GameData/RealPlume-Stock/Squad/RAPIER.cfg
index 4ebc8ee..c9fe8f7 100644
--- a/GameData/RealPlume-Stock/Squad/RAPIER.cfg
+++ b/GameData/RealPlume-Stock/Squad/RAPIER.cfg
@@ -1,4 +1,4 @@
-@PART[RAPIER]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // CR-7 R.A.P.I.E.R. Engine
+@PART[RAPIER]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // CR-7 R.A.P.I.E.R. Engine
 {
 	PLUME
 	{
@@ -59,7 +59,7 @@
 	}
 }
 //The stock model doesn't appear to have bypass ramjets
-@PART[RAPIER]:FOR[zzRealPlume]:NEEDS[!ReStock]
+@PART[RAPIER]:FOR[zzRealPlume]:NEEDS[!ReStock,!StockWaterfallEffects]
 {
 	@EFFECTS
 	{
@@ -70,7 +70,7 @@
 	}
 }
 //The RAPIER has 4 smaller nozzles instead of one big nozzle, so just going by plumeScale makes it too quiet
-@PART[RAPIER]:FOR[zzRealPlume]:NEEDS[!ReStock]
+@PART[RAPIER]:FOR[zzRealPlume]:NEEDS[!ReStock,!StockWaterfallEffects]
 {
 	@EFFECTS
 	{
diff --git a/GameData/RealPlume-Stock/Squad/RAPIER_OLD.txt b/GameData/RealPlume-Stock/Squad/RAPIER_OLD.txt
new file mode 100644
index 0000000..bba514e
--- /dev/null
+++ b/GameData/RealPlume-Stock/Squad/RAPIER_OLD.txt
@@ -0,0 +1,39 @@
+// If the fancy Rapier plume causes low fps for you, please delete RAPIER.cfg and rename this file from RAPIER_OLD.txt to RAPIER_OLD.cfg
+//A similar option is available for reStock as well in that folder
+
+@PART[RAPIER]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // CR-7 R.A.P.I.E.R. Engine
+{
+    PLUME
+    {
+        name = Turbojet
+        transformName = thrustTransform
+        localRotation = 0,0,0
+        localPosition = 0,0,-0.3
+        fixedScale = 0.7
+        energy = 0.8
+        speed = 1
+        emissionMult = 1.0
+    }
+    PLUME
+    {
+        name = Hypergolic-Lower
+        transformName = thrustTransform
+        localRotation = 0,0,0
+        plumePosition = 0,0,0.2
+        flarePosition = 0,0,0.4
+        plumeScale = 0.4
+        flareScale = 0.6
+        energy = 1
+        speed = 1
+        emissionMult = 1.0
+    }
+    @MODULE[ModuleEngines*],0
+    {
+        %powerEffectName = Turbojet
+        %spoolEffectName = Turbojet-Spool
+    }
+    @MODULE[ModuleEngines*],1
+    {
+        %powerEffectName = Hypergolic-Lower
+    }
+}
diff --git a/GameData/RealPlume-Stock/Squad/Size3AdvancedEngine_Rhino.cfg b/GameData/RealPlume-Stock/Squad/Size3AdvancedEngine_Rhino.cfg
index 421d5e3..868c2c6 100644
--- a/GameData/RealPlume-Stock/Squad/Size3AdvancedEngine_Rhino.cfg
+++ b/GameData/RealPlume-Stock/Squad/Size3AdvancedEngine_Rhino.cfg
@@ -1,4 +1,4 @@
-@PART[Size3AdvancedEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // Kerbodyne KR-2L+ "Rhino" Liquid Fuel Engine
+@PART[Size3AdvancedEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // Kerbodyne KR-2L+ "Rhino" Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/Size3EngineCluster_Mammoth.cfg b/GameData/RealPlume-Stock/Squad/Size3EngineCluster_Mammoth.cfg
index 46d1ff0..96cce0a 100644
--- a/GameData/RealPlume-Stock/Squad/Size3EngineCluster_Mammoth.cfg
+++ b/GameData/RealPlume-Stock/Squad/Size3EngineCluster_Mammoth.cfg
@@ -1,4 +1,4 @@
-@PART[Size3EngineCluster]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // S3 KS-25x4 "Mammoth" Liquid Fuel Engine
+@PART[Size3EngineCluster]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // S3 KS-25x4 "Mammoth" Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/engineLargeSkipper_v2.cfg b/GameData/RealPlume-Stock/Squad/engineLargeSkipper_v2.cfg
index 61c8e05..750e1c7 100644
--- a/GameData/RealPlume-Stock/Squad/engineLargeSkipper_v2.cfg
+++ b/GameData/RealPlume-Stock/Squad/engineLargeSkipper_v2.cfg
@@ -1,4 +1,4 @@
-@PART[engineLargeSkipper_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // RE-I5 "Skipper" Liquid Fuel Engine
+@PART[engineLargeSkipper_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // RE-I5 "Skipper" Liquid Fuel Engine
 {
 		@MODULE[ModuleEngines*]
 		{
diff --git a/GameData/RealPlume-Stock/Squad/ionEngine_Dawn.cfg b/GameData/RealPlume-Stock/Squad/ionEngine_Dawn.cfg
index fbbd9fe..d22e714 100644
--- a/GameData/RealPlume-Stock/Squad/ionEngine_Dawn.cfg
+++ b/GameData/RealPlume-Stock/Squad/ionEngine_Dawn.cfg
@@ -1,4 +1,4 @@
-@PART[ionEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // IX-6315 "Dawn" Electric Propulsion System
+@PART[ionEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // IX-6315 "Dawn" Electric Propulsion System
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/jetEngineAfterburning.cfg b/GameData/RealPlume-Stock/Squad/jetEngineAfterburning.cfg
index 55ef19d..0384988 100644
--- a/GameData/RealPlume-Stock/Squad/jetEngineAfterburning.cfg
+++ b/GameData/RealPlume-Stock/Squad/jetEngineAfterburning.cfg
@@ -1,4 +1,4 @@
-@PART[turboJet]:FOR[RealPlume]:NEEDS[SmokeScreen] // J-404 "Panther" Afterburning Turbofan
+@PART[turboJet]:FOR[RealPlume]:NEEDS[SmokeScreen,!StockWaterfallEffects] // J-404 "Panther" Afterburning Turbofan
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/jetEngineBasic.cfg b/GameData/RealPlume-Stock/Squad/jetEngineBasic.cfg
index 9fa2dee..c18971c 100644
--- a/GameData/RealPlume-Stock/Squad/jetEngineBasic.cfg
+++ b/GameData/RealPlume-Stock/Squad/jetEngineBasic.cfg
@@ -1,4 +1,4 @@
-@PART[JetEngine]:FOR[RealPlume]:NEEDS[SmokeScreen] // J-33 "Wheesley" Turbofan Engine
+@PART[JetEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!StockWaterfallEffects] // J-33 "Wheesley" Turbofan Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/jetEngineBig.cfg b/GameData/RealPlume-Stock/Squad/jetEngineBig.cfg
index ce086a5..a13a0b8 100644
--- a/GameData/RealPlume-Stock/Squad/jetEngineBig.cfg
+++ b/GameData/RealPlume-Stock/Squad/jetEngineBig.cfg
@@ -1,4 +1,4 @@
-@PART[turboFanSize2]:FOR[RealPlume]:NEEDS[SmokeScreen] // J-90 "Goliath" Turbofan Engine
+@PART[turboFanSize2]:FOR[RealPlume]:NEEDS[SmokeScreen,!StockWaterfallEffects] // J-90 "Goliath" Turbofan Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/jetEngineTurbo.cfg b/GameData/RealPlume-Stock/Squad/jetEngineTurbo.cfg
index 47ba4f9..1e69708 100644
--- a/GameData/RealPlume-Stock/Squad/jetEngineTurbo.cfg
+++ b/GameData/RealPlume-Stock/Squad/jetEngineTurbo.cfg
@@ -1,4 +1,4 @@
-@PART[turboFanEngine]:FOR[RealPlume]:NEEDS[SmokeScreen] // J-X4 "Whiplash" Turbo Ramjet Engine
+@PART[turboFanEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!StockWaterfallEffects] // J-X4 "Whiplash" Turbo Ramjet Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/liquidEngine2-2_v2_Poodle.cfg b/GameData/RealPlume-Stock/Squad/liquidEngine2-2_v2_Poodle.cfg
index 513b2ed..98fee0f 100644
--- a/GameData/RealPlume-Stock/Squad/liquidEngine2-2_v2_Poodle.cfg
+++ b/GameData/RealPlume-Stock/Squad/liquidEngine2-2_v2_Poodle.cfg
@@ -1,4 +1,4 @@
-@PART[liquidEngine2-2_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // RE-L10 "Poodle" Liquid Fuel Engine
+@PART[liquidEngine2-2_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // RE-L10 "Poodle" Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/liquidEngine2_Swivel.cfg b/GameData/RealPlume-Stock/Squad/liquidEngine2_Swivel.cfg
index 492d84f..f676135 100644
--- a/GameData/RealPlume-Stock/Squad/liquidEngine2_Swivel.cfg
+++ b/GameData/RealPlume-Stock/Squad/liquidEngine2_Swivel.cfg
@@ -1,4 +1,4 @@
-@PART[liquidEngine2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // LV-T45 "Swivel" Liquid Fuel Engine
+@PART[liquidEngine2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // LV-T45 "Swivel" Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/liquidEngine3_v2_Terrier.cfg b/GameData/RealPlume-Stock/Squad/liquidEngine3_v2_Terrier.cfg
index 3e08b0c..70778a6 100644
--- a/GameData/RealPlume-Stock/Squad/liquidEngine3_v2_Terrier.cfg
+++ b/GameData/RealPlume-Stock/Squad/liquidEngine3_v2_Terrier.cfg
@@ -1,4 +1,4 @@
-@PART[liquidEngine3_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // LV-909 "Terrier" Liquid Fuel Engine
+@PART[liquidEngine3_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // LV-909 "Terrier" Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/liquidEngineAerospike.cfg b/GameData/RealPlume-Stock/Squad/liquidEngineAerospike.cfg
index 76d5be2..15b6d4a 100644
--- a/GameData/RealPlume-Stock/Squad/liquidEngineAerospike.cfg
+++ b/GameData/RealPlume-Stock/Squad/liquidEngineAerospike.cfg
@@ -1,8 +1,8 @@
-@PART[toroidalAerospike]:NEEDS[ReStock,SmokeScreen]:AFTER[ReStock]
+@PART[toroidalAerospike]:NEEDS[ReStock,SmokeScreen,!StockWaterfallEffects]:AFTER[ReStock]
 {
   !EFFECTS {}
 }
-@PART[toroidalAerospike]:NEEDS[zRealPlume,SmokeScreen] // T-1 Toroidal Aerospike "Dart" Liquid Fuel Engine
+@PART[toroidalAerospike]:NEEDS[zRealPlume,SmokeScreen,!StockWaterfallEffects] // T-1 Toroidal Aerospike "Dart" Liquid Fuel Engine
 {
 	@MODULE[ModuleEngines*]
 	{
diff --git a/GameData/RealPlume-Stock/Squad/liquidEngineMainsail_v2.cfg b/GameData/RealPlume-Stock/Squad/liquidEngineMainsail_v2.cfg
index d0fbe44..205c9ee 100644
--- a/GameData/RealPlume-Stock/Squad/liquidEngineMainsail_v2.cfg
+++ b/GameData/RealPlume-Stock/Squad/liquidEngineMainsail_v2.cfg
@@ -1,4 +1,4 @@
-@PART[liquidEngineMainsail_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // RE-M3 "Mainsail" Liquid Fuel Engine
+@PART[liquidEngineMainsail_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // RE-M3 "Mainsail" Liquid Fuel Engine
 {
 		@MODULE[ModuleEngines*]
 		{
@@ -26,7 +26,7 @@
 		flareScale = 0.15
 		}
 }
-@PART[liquidEngineMainsail_v2]:AFTER[zzRealPlume]:NEEDS[!ReStock]
+@PART[liquidEngineMainsail_v2]:AFTER[zzRealPlume]:NEEDS[!ReStock,!StockWaterfallEffects]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/Squad/liquidEngineMini_v2_Spark.cfg b/GameData/RealPlume-Stock/Squad/liquidEngineMini_v2_Spark.cfg
index 6d61335..61c1a55 100644
--- a/GameData/RealPlume-Stock/Squad/liquidEngineMini_v2_Spark.cfg
+++ b/GameData/RealPlume-Stock/Squad/liquidEngineMini_v2_Spark.cfg
@@ -1,4 +1,4 @@
-@PART[liquidEngineMini_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // 48-7S "Spark" Liquid Fuel Engine
+@PART[liquidEngineMini_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // 48-7S "Spark" Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/liquidEngineSSME.cfg b/GameData/RealPlume-Stock/Squad/liquidEngineSSME.cfg
index 0fc7bef..cf9e6e3 100644
--- a/GameData/RealPlume-Stock/Squad/liquidEngineSSME.cfg
+++ b/GameData/RealPlume-Stock/Squad/liquidEngineSSME.cfg
@@ -1,4 +1,4 @@
-@PART[SSME]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // S3 KS-25 "Vector" Liquid Fuel Engine
+@PART[SSME]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // S3 KS-25 "Vector" Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/liquidEngine_Reliant.cfg b/GameData/RealPlume-Stock/Squad/liquidEngine_Reliant.cfg
index ac6834f..78e4b4b 100644
--- a/GameData/RealPlume-Stock/Squad/liquidEngine_Reliant.cfg
+++ b/GameData/RealPlume-Stock/Squad/liquidEngine_Reliant.cfg
@@ -1,4 +1,4 @@
-@PART[liquidEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // LV-T30 "Reliant" Liquid Fuel Engine
+@PART[liquidEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // LV-T30 "Reliant" Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/microEngine_v2_Ant.cfg b/GameData/RealPlume-Stock/Squad/microEngine_v2_Ant.cfg
index 4f61c55..84fafa9 100644
--- a/GameData/RealPlume-Stock/Squad/microEngine_v2_Ant.cfg
+++ b/GameData/RealPlume-Stock/Squad/microEngine_v2_Ant.cfg
@@ -1,4 +1,4 @@
-@PART[microEngine_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // LV-1 "Ant" Liquid Fuel Engine
+@PART[microEngine_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // LV-1 "Ant" Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/miniJet.cfg b/GameData/RealPlume-Stock/Squad/miniJet.cfg
index 8a17db6..614b7a4 100644
--- a/GameData/RealPlume-Stock/Squad/miniJet.cfg
+++ b/GameData/RealPlume-Stock/Squad/miniJet.cfg
@@ -1,4 +1,4 @@
-@PART[miniJetEngine]:FOR[RealPlume]:NEEDS[SmokeScreen] // J-20 "Juno" Basic Jet Engine
+@PART[miniJetEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!StockWaterfallEffects] // J-20 "Juno" Basic Jet Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/nuclearEngine_NERV.cfg b/GameData/RealPlume-Stock/Squad/nuclearEngine_NERV.cfg
index f50e837..bcba5f1 100644
--- a/GameData/RealPlume-Stock/Squad/nuclearEngine_NERV.cfg
+++ b/GameData/RealPlume-Stock/Squad/nuclearEngine_NERV.cfg
@@ -1,5 +1,5 @@
 //Patch for NERV without Kerbal Atomics Installed
-@PART[nuclearEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!KerbalAtomics] // LV-N "Nerv" Atomic Rocket Motor
+@PART[nuclearEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!KerbalAtomics,!StockWaterfallEffects] // LV-N "Nerv" Atomic Rocket Motor
 {
     PLUME
     {
@@ -28,7 +28,7 @@
     }
 }
 //Patch for NERV with Kerbal Atomics and nucelar engines use LF patch Installed
-@PART[nuclearEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,KerbalAtomics,NTRsUseLF,!ReStock] // LV-N "Nerv" Atomic Rocket Motor
+@PART[nuclearEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,KerbalAtomics,NTRsUseLF,!ReStock,!StockWaterfallEffects] // LV-N "Nerv" Atomic Rocket Motor
 {
     PLUME
     {
@@ -59,7 +59,7 @@
 //Patch for NERV with Kerbal atomics installed and no NTR uses LF patch.
 // at AFTER:[zKerbalAtomics] KA makes NERV multimode so that it has LF and LH2 modes. It also inserts dedicated plume effects at this point.
 // This patch runs after that and manually creates the plume as normal RealPlume patching would attempt to make the plume at FOR:[zRealPlume]
-@PART[nuclearEngine]:NEEDS[RealPlume,SmokeScreen,KerbalAtomics,!ReStock,!NTRsUseLF]:FOR[zzKerbalAtomics]
+@PART[nuclearEngine]:NEEDS[RealPlume,SmokeScreen,KerbalAtomics,!ReStock,!NTRsUseLF,!StockWaterfallEffects]:FOR[zzKerbalAtomics]
 {
     @EFFECTS
     {
diff --git a/GameData/RealPlume-Stock/Squad/omsEngine_Puff.cfg b/GameData/RealPlume-Stock/Squad/omsEngine_Puff.cfg
index 4482282..86774d0 100644
--- a/GameData/RealPlume-Stock/Squad/omsEngine_Puff.cfg
+++ b/GameData/RealPlume-Stock/Squad/omsEngine_Puff.cfg
@@ -1,4 +1,4 @@
-@PART[omsEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // O-10 "Puff" MonoPropellant Fuel Engine
+@PART[omsEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // O-10 "Puff" MonoPropellant Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/radialEngineMini_v2_Spider.cfg b/GameData/RealPlume-Stock/Squad/radialEngineMini_v2_Spider.cfg
index cd7a7f2..6332af6 100644
--- a/GameData/RealPlume-Stock/Squad/radialEngineMini_v2_Spider.cfg
+++ b/GameData/RealPlume-Stock/Squad/radialEngineMini_v2_Spider.cfg
@@ -1,4 +1,4 @@
-@PART[radialEngineMini_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // LV-1R "Spider" Liquid Fuel Engine
+@PART[radialEngineMini_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // LV-1R "Spider" Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/radialLiquidEngine1-2.cfg b/GameData/RealPlume-Stock/Squad/radialLiquidEngine1-2.cfg
index b2576b0..9f8f32f 100644
--- a/GameData/RealPlume-Stock/Squad/radialLiquidEngine1-2.cfg
+++ b/GameData/RealPlume-Stock/Squad/radialLiquidEngine1-2.cfg
@@ -1,4 +1,4 @@
-@PART[radialLiquidEngine1-2]:FOR[RealPlume]:NEEDS[SmokeScreen] // Mk-55 "Thud" Liquid Fuel Engine
+@PART[radialLiquidEngine1-2]:FOR[RealPlume]:NEEDS[SmokeScreen,!StockWaterfallEffects] // Mk-55 "Thud" Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/Squad/smallRadialEngineTwitch_v2.cfg b/GameData/RealPlume-Stock/Squad/smallRadialEngineTwitch_v2.cfg
index 96472df..b94bc12 100644
--- a/GameData/RealPlume-Stock/Squad/smallRadialEngineTwitch_v2.cfg
+++ b/GameData/RealPlume-Stock/Squad/smallRadialEngineTwitch_v2.cfg
@@ -1,4 +1,4 @@
-@PART[smallRadialEngine_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // 24-77 "Twitch" Liquid Fuel Engine
+@PART[smallRadialEngine_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // 24-77 "Twitch" Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineKE-1.cfg b/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineKE-1.cfg
index 31db7d3..4ebbd3e 100644
--- a/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineKE-1.cfg
+++ b/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineKE-1.cfg
@@ -1,4 +1,4 @@
-@PART[LiquidEngineKE-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // Kerbodyne KE-1 'Mastodon' Liquid Fuel Engine
+@PART[LiquidEngineKE-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // Kerbodyne KE-1 'Mastodon' Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineLV-T91.cfg b/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineLV-T91.cfg
index 7688ab1..61ca18d 100644
--- a/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineLV-T91.cfg
+++ b/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineLV-T91.cfg
@@ -1,4 +1,4 @@
-@PART[LiquidEngineLV-T91]:FOR[RealPlume]:NEEDS[SmokeScreen] // LV-T91 'Cheetah' Liquid Fuel Engine
+@PART[LiquidEngineLV-T91]:FOR[RealPlume]:NEEDS[SmokeScreen,!StockWaterfallEffects] // LV-T91 'Cheetah' Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineLV-TX87.cfg b/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineLV-TX87.cfg
index 18f0ae2..06072e6 100644
--- a/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineLV-TX87.cfg
+++ b/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineLV-TX87.cfg
@@ -1,4 +1,4 @@
-@PART[LiquidEngineLV-TX87]:FOR[RealPlume]:NEEDS[SmokeScreen] // LV-TX87 'Bobcat' Liquid Fuel Engine
+@PART[LiquidEngineLV-TX87]:FOR[RealPlume]:NEEDS[SmokeScreen,!StockWaterfallEffects] // LV-TX87 'Bobcat' Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRE-I2_Skiff.cfg b/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRE-I2_Skiff.cfg
index e8a95eb..46f7124 100644
--- a/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRE-I2_Skiff.cfg
+++ b/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRE-I2_Skiff.cfg
@@ -1,4 +1,4 @@
-@PART[LiquidEngineRE-I2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // RE-I2 'Skiff' Liquid Fuel Engine
+@PART[LiquidEngineRE-I2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // RE-I2 'Skiff' Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRE-J10_Wolfhound.cfg b/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRE-J10_Wolfhound.cfg
index 775c783..0cb9280 100644
--- a/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRE-J10_Wolfhound.cfg
+++ b/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRE-J10_Wolfhound.cfg
@@ -1,4 +1,4 @@
-@PART[LiquidEngineRE-J10]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // RE-J10 'Wolfhound'  Liquid Fuel Engine
+@PART[LiquidEngineRE-J10]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // RE-J10 'Wolfhound'  Liquid Fuel Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRK-7_Kodiak.cfg b/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRK-7_Kodiak.cfg
index af588ca..494ce36 100644
--- a/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRK-7_Kodiak.cfg
+++ b/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRK-7_Kodiak.cfg
@@ -1,4 +1,4 @@
-@PART[LiquidEngineRK-7]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // RK-7 'Kodiak' Liquid Fueled Enine
+@PART[LiquidEngineRK-7]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // RK-7 'Kodiak' Liquid Fueled Enine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRV-1.cfg b/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRV-1.cfg
index 5f5d8d9..0d05764 100644
--- a/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRV-1.cfg
+++ b/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRV-1.cfg
@@ -1,4 +1,4 @@
-@PART[LiquidEngineRV-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // RV-1 'Cub' Vernier Engine
+@PART[LiquidEngineRV-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // RV-1 'Cub' Vernier Engine
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/TantaresLV/ALV_1_Engine_1.cfg b/GameData/RealPlume-Stock/TantaresLV/ALV_1_Engine_1.cfg
index 209d985..1f56b37 100644
--- a/GameData/RealPlume-Stock/TantaresLV/ALV_1_Engine_1.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/ALV_1_Engine_1.cfg
@@ -1,4 +1,4 @@
-@PART[ALV_1_Engine_1]:NEEDS[RealPlume,SmokeScreen] //A-IF1 Boosters Stage
+@PART[ALV_1_Engine_1]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //A-IF1 Boosters Stage
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/TantaresLV/ALV_1_Engine_2.cfg b/GameData/RealPlume-Stock/TantaresLV/ALV_1_Engine_2.cfg
index ae4ff20..6d6780d 100644
--- a/GameData/RealPlume-Stock/TantaresLV/ALV_1_Engine_2.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/ALV_1_Engine_2.cfg
@@ -1,4 +1,4 @@
-@PART[ALV_1_Engine_2]:NEEDS[RealPlume,SmokeScreen] //A-IF1 Boosters Stage
+@PART[ALV_1_Engine_2]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //A-IF1 Boosters Stage
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/TantaresLV/ALV_2_Engine_1.cfg b/GameData/RealPlume-Stock/TantaresLV/ALV_2_Engine_1.cfg
index 1a80d73..c0f5f11 100644
--- a/GameData/RealPlume-Stock/TantaresLV/ALV_2_Engine_1.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/ALV_2_Engine_1.cfg
@@ -1,4 +1,4 @@
-@PART[ALV_2_Engine_1]:NEEDS[RealPlume,SmokeScreen] //A-H0T Rocket Motor
+@PART[ALV_2_Engine_1]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //A-H0T Rocket Motor
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/TantaresLV/ALV_3_Engine_1.cfg b/GameData/RealPlume-Stock/TantaresLV/ALV_3_Engine_1.cfg
index cfedb6c..7f9c6da 100644
--- a/GameData/RealPlume-Stock/TantaresLV/ALV_3_Engine_1.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/ALV_3_Engine_1.cfg
@@ -1,4 +1,4 @@
-@PART[ALV_3_Engine_1]:NEEDS[RealPlume,SmokeScreen] //A-MW5 Rocket Motor
+@PART[ALV_3_Engine_1]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //A-MW5 Rocket Motor
 {
       PLUME
       {
@@ -9,7 +9,7 @@
           energy = 1
           speed = 1
           emissionMult = 1
-          
+
           flarePosition = 0,0,-0.3
           flareScale = 0.3
 
diff --git a/GameData/RealPlume-Stock/TantaresLV/AndromedaUS_Engine_1.cfg b/GameData/RealPlume-Stock/TantaresLV/AndromedaUS_Engine_1.cfg
index c71c165..db17244 100644
--- a/GameData/RealPlume-Stock/TantaresLV/AndromedaUS_Engine_1.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/AndromedaUS_Engine_1.cfg
@@ -1,4 +1,4 @@
-@PART[AndromedaUS_Engine_1]:NEEDS[zRealPlume,SmokeScreen]
+@PART[AndromedaUS_Engine_1]:NEEDS[zRealPlume,SmokeScreen,!Waterfall]
 {
   @MODULE[ModuleEngines*]
   {
diff --git a/GameData/RealPlume-Stock/TantaresLV/AndromedaUS_VernierEngine_1.cfg b/GameData/RealPlume-Stock/TantaresLV/AndromedaUS_VernierEngine_1.cfg
index 98d48f1..e434ae3 100644
--- a/GameData/RealPlume-Stock/TantaresLV/AndromedaUS_VernierEngine_1.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/AndromedaUS_VernierEngine_1.cfg
@@ -1,4 +1,4 @@
-@PART[AndromedaUS_VernierEngine_1]:NEEDS[zRealPlume,SmokeScreen]
+@PART[AndromedaUS_VernierEngine_1]:NEEDS[zRealPlume,SmokeScreen,!Waterfall]
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/TantaresLV/chara_lv_engine_s0p5_1.cfg b/GameData/RealPlume-Stock/TantaresLV/chara_lv_engine_s0p5_1.cfg
index 093aad9..ccec48b 100644
--- a/GameData/RealPlume-Stock/TantaresLV/chara_lv_engine_s0p5_1.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/chara_lv_engine_s0p5_1.cfg
@@ -1,4 +1,4 @@
-@PART[chara_lv_engine_s0p5_1]:NEEDS[RealPlume,SmokeScreen] //Kosmos 2I first stage. UDMH+NTO
+@PART[chara_lv_engine_s0p5_1]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //Kosmos 2I first stage. UDMH+NTO
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/TantaresLV/chara_lv_engine_s0p5_2.cfg b/GameData/RealPlume-Stock/TantaresLV/chara_lv_engine_s0p5_2.cfg
index 32d4b79..eca936a 100644
--- a/GameData/RealPlume-Stock/TantaresLV/chara_lv_engine_s0p5_2.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/chara_lv_engine_s0p5_2.cfg
@@ -1,4 +1,4 @@
-@PART[chara_lv_engine_s0p5_2]:NEEDS[zRealPlume,SmokeScreen]
+@PART[chara_lv_engine_s0p5_2]:NEEDS[zRealPlume,SmokeScreen,!Waterfall]
 {
       !EFFECTS{}
       PLUME
diff --git a/GameData/RealPlume-Stock/TantaresLV/corvus_lv_bare_engine_s1_1.cfg b/GameData/RealPlume-Stock/TantaresLV/corvus_lv_bare_engine_s1_1.cfg
index e39315c..4663924 100644
--- a/GameData/RealPlume-Stock/TantaresLV/corvus_lv_bare_engine_s1_1.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/corvus_lv_bare_engine_s1_1.cfg
@@ -1,4 +1,4 @@
-@PART[corvus_lv_bare_engine_s1_1]:NEEDS[RealPlume,SmokeScreen] //Kosmos first stage bare
+@PART[corvus_lv_bare_engine_s1_1]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //Kosmos first stage bare
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/TantaresLV/corvus_lv_bare_engine_s1_2.cfg b/GameData/RealPlume-Stock/TantaresLV/corvus_lv_bare_engine_s1_2.cfg
index 4057a7d..ec4b7d4 100644
--- a/GameData/RealPlume-Stock/TantaresLV/corvus_lv_bare_engine_s1_2.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/corvus_lv_bare_engine_s1_2.cfg
@@ -1,4 +1,4 @@
-@PART[corvus_lv_bare_engine_s1_2]:NEEDS[zRealPlume,SmokeScreen]//Kosmos 3M upper stage bare
+@PART[corvus_lv_bare_engine_s1_2]:NEEDS[zRealPlume,SmokeScreen,!Waterfall]//Kosmos 3M upper stage bare
 {
     @MODULE[ModuleEngines*]
     {
@@ -24,7 +24,7 @@
 				streamScale = 0.5
 	}
 }
-@PART[corvus_lv_bare_engine_s1_2]:FOR[zzRealPlume]
+@PART[corvus_lv_bare_engine_s1_2]:FOR[zzRealPlume]:NEEDS[RealPlume,!Waterfall]
 {
   @EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/TantaresLV/corvus_lv_engine_s1_1.cfg b/GameData/RealPlume-Stock/TantaresLV/corvus_lv_engine_s1_1.cfg
index 9f20c47..af4af98 100644
--- a/GameData/RealPlume-Stock/TantaresLV/corvus_lv_engine_s1_1.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/corvus_lv_engine_s1_1.cfg
@@ -1,4 +1,4 @@
-@PART[corvus_lv_engine_s1_1]:NEEDS[RealPlume,SmokeScreen] //Kosmos first stage bare
+@PART[corvus_lv_engine_s1_1]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //Kosmos first stage bare
 {
     PLUME
     {
diff --git a/GameData/RealPlume-Stock/TantaresLV/corvus_lv_engine_s1_2.cfg b/GameData/RealPlume-Stock/TantaresLV/corvus_lv_engine_s1_2.cfg
index 6fcc846..c9b5343 100644
--- a/GameData/RealPlume-Stock/TantaresLV/corvus_lv_engine_s1_2.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/corvus_lv_engine_s1_2.cfg
@@ -1,4 +1,4 @@
-@PART[corvus_lv_engine_s1_2]:NEEDS[zRealPlume,SmokeScreen]//Kosmos 3M upper stage
+@PART[corvus_lv_engine_s1_2]:NEEDS[zRealPlume,SmokeScreen,!Waterfall]//Kosmos 3M upper stage
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/TantaresLV/delphini_us_engine_s1_1.cfg b/GameData/RealPlume-Stock/TantaresLV/delphini_us_engine_s1_1.cfg
index dae64da..ac2fd5d 100644
--- a/GameData/RealPlume-Stock/TantaresLV/delphini_us_engine_s1_1.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/delphini_us_engine_s1_1.cfg
@@ -1,4 +1,4 @@
-@PART[delphini_us_engine_s1_1]:NEEDS[RealPlume,SmokeScreen] //Briz engine
+@PART[delphini_us_engine_s1_1]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //Briz engine
 {
     @MODULE[ModuleEngines*]
     {
diff --git a/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1_1_SOYUZ_RD108.cfg b/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1_1_SOYUZ_RD108.cfg
index eee40b0..5558708 100644
--- a/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1_1_SOYUZ_RD108.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1_1_SOYUZ_RD108.cfg
@@ -1,6 +1,6 @@
 //Soyuz core 1st stage RD108 "Hagehval" Rocket Engine
 
-@PART[tantares_lv_engine_s1_1]:NEEDS[RealPlume,SmokeScreen]
+@PART[tantares_lv_engine_s1_1]:NEEDS[RealPlume,SmokeScreen,!Waterfall]
 {
 		@MODULE[ModuleEngines*]
 		{
@@ -30,7 +30,7 @@
 		}
 }
 
-@PART[tantares_lv_engine_s1_1]:AFTER[RealPlume]:NEEDS[RealPlume,SmokeScreen]
+@PART[tantares_lv_engine_s1_1]:AFTER[RealPlume]:NEEDS[RealPlume,SmokeScreen,!Waterfall]
 {
   %EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1_3_SOYUZ_RD0110_15.cfg b/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1_3_SOYUZ_RD0110_15.cfg
index d1f6a05..57e3c15 100644
--- a/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1_3_SOYUZ_RD0110_15.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1_3_SOYUZ_RD0110_15.cfg
@@ -1,4 +1,4 @@
-@PART[tantares_lv_engine_s1_3,tantares_lv_engine_s1p2_3]:NEEDS[zRealPlume,SmokeScreen] //Tantares RD-0110A "Litenugle" Rocket Engine 1.25m (and optional 1.5m version)
+@PART[tantares_lv_engine_s1_3,tantares_lv_engine_s1p2_3]:NEEDS[zRealPlume,SmokeScreen,!Waterfall] //Tantares RD-0110A "Litenugle" Rocket Engine 1.25m (and optional 1.5m version)
 {
 		@MODULE[ModuleEngines*]
 		{
@@ -26,7 +26,7 @@
 		}
 }
 
-@PART[tantares_lv_engine_s1_3,tantares_lv_engine_s1p2_3]:AFTER[RealPlume]:NEEDS[RealPlume,SmokeScreen]
+@PART[tantares_lv_engine_s1_3,tantares_lv_engine_s1p2_3]:AFTER[RealPlume]:NEEDS[RealPlume,SmokeScreen,!Waterfall]
 {
   %EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1p5_2_SOYUZ_RD107.cfg b/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1p5_2_SOYUZ_RD107.cfg
index 9094615..18ae2d9 100644
--- a/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1p5_2_SOYUZ_RD107.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1p5_2_SOYUZ_RD107.cfg
@@ -1,6 +1,6 @@
 //Soyuz booster engine RD107 "Hagesegl" Rocket Engine
 
-@PART[tantares_lv_engine_s1p5_2]:NEEDS[zRealPlume,SmokeScreen]
+@PART[tantares_lv_engine_s1p5_2]:NEEDS[zRealPlume,SmokeScreen,!Waterfall]
 {
 		@MODULE[ModuleEngines*]
 		{
@@ -30,7 +30,7 @@
 		}
 }
 
-@PART[tantares_lv_engine_s1p5_2]:AFTER[RealPlume]:NEEDS[RealPlume,SmokeScreen]
+@PART[tantares_lv_engine_s1p5_2]:AFTER[RealPlume]:NEEDS[RealPlume,SmokeScreen,!Waterfall]
 {
   %EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1p5_3_SOYUZ_RD0110_1875.cfg b/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1p5_3_SOYUZ_RD0110_1875.cfg
index f511fca..e4cb1d9 100644
--- a/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1p5_3_SOYUZ_RD0110_1875.cfg
+++ b/GameData/RealPlume-Stock/TantaresLV/tantares_lv_engine_s1p5_3_SOYUZ_RD0110_1875.cfg
@@ -1,4 +1,4 @@
-@PART[tantares_lv_engine_s1p5_3]:NEEDS[zRealPlume,SmokeScreen] //SOYUZ RD-0110 "Hageugle" Rocket Engine
+@PART[tantares_lv_engine_s1p5_3]:NEEDS[zRealPlume,SmokeScreen,!Waterfall] //SOYUZ RD-0110 "Hageugle" Rocket Engine
 {
 		@MODULE[ModuleEngines*]
 		{
@@ -26,7 +26,7 @@
 		}
 }
 
-@PART[tantares_lv_engine_s1p5_3]:AFTER[RealPlume]:NEEDS[RealPlume,SmokeScreen]
+@PART[tantares_lv_engine_s1p5_3]:AFTER[RealPlume]:NEEDS[RealPlume,SmokeScreen,!Waterfall]
 {
   %EFFECTS
   {
diff --git a/GameData/RealPlume-Stock/TantaresLV/zDeprecated_CLV_1_Engine_1.cfg b/GameData/RealPlume-Stock/TantaresLV/zDeprecated_CLV_1_Engine_1.cfg
deleted file mode 100644
index 3316a2d..0000000
--- a/GameData/RealPlume-Stock/TantaresLV/zDeprecated_CLV_1_Engine_1.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-@PART[CLV_1_Engine_1]:NEEDS[RealPlume,SmokeScreen] //C-14U "Krabbe" Rocket Engine //DEPRECATED
-{
-    PLUME
-    {
-        name = Hypergolic-Upper
-        transformName = thrustTransform
-        localRotation = 0,0,0
-        localRotation = 0,0,0
-        plumePosition = 0,0,0.25
-        flarePosition = 0,0,0.25
-        plumeScale = 0.5
-        flareScale = 0.7
-        energy = 1
-        speed = 1
-    }
-    @MODULE[ModuleEngines*],0
-    {
-        %powerEffectName = Hypergolic-Upper
-    }
-    //Remove extra effects
-    @EFFECTS
-    {
-        !running_main{}
-    }
-}
diff --git a/GameData/RealPlume-Stock/TantaresLV/zDeprectaed_CLV_2_Engine_1.cfg b/GameData/RealPlume-Stock/TantaresLV/zDeprectaed_CLV_2_Engine_1.cfg
deleted file mode 100644
index ee24282..0000000
--- a/GameData/RealPlume-Stock/TantaresLV/zDeprectaed_CLV_2_Engine_1.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-@PART[CLV_2_Engine_1]:NEEDS[RealPlume,SmokeScreen] //C-S3M
-{
-    PLUME
-    {
-        name = Hypergolic-Upper
-        transformName = thrustTransform
-        localRotation = 0,0,0
-        localPosition = 0,0,0.25
-        fixedScale = 0.8
-        energy = 1
-        speed = 1
-    }
-    PLUME
-    {
-        name = Hypergolic-Vernier
-        transformName = vernierTransform
-        localRotation = 0,0,0
-        localPosition = 0,0,0.9
-        fixedScale = 1
-        energy = 1
-        speed = 1
-    }
-    @MODULE[ModuleEngines*],0
-    {
-        %powerEffectName = Hypergolic-Upper
-    }
-    @MODULE[ModuleEngines*],1
-    {
-        %powerEffectName = Hypergolic-Vernier
-    }
-}
diff --git a/RealPlume-StockConfigs.netkan b/RealPlume-StockConfigs.netkan
index a7a212c..401604f 100644
--- a/RealPlume-StockConfigs.netkan
+++ b/RealPlume-StockConfigs.netkan
@@ -1,14 +1,14 @@
 {
     "spec_version"      : "v1.4",
     "$kref"             : "#/ckan/github/KSP-RO/RealPlume-StockConfigs",
-    "ksp_version_min"   : "1.8.1",
-    "ksp_version_max"   : "1.9.99",
+    "$vref"             : "#/ckan/ksp-avc",
     "name"              : "Real Plume - Stock Configs",
-    "author"	          : [ "Zorg", "Nhawks1717", "Felger" ],
+    "author"            : [ "Zorg", "Nhawks1717", "Felger" ],
     "identifier"        : "RealPlume-StockConfigs",
     "abstract"          : "A set of configs for RealPlume to support stock and many mods with expanding Smokescreen plumes. Requires RealPlume and Smokescreen to function",
     "license"           : "CC-BY-NC-SA",
     "depends" : [
+        { "name" : "ModuleManager" },
         { "name" : "RealPlume" }
     ],
     "suggests" : [
@@ -40,7 +40,7 @@
     ],
     "provides"  : [ "RealPlumeConfigs" ],
     "resources" : {
-    "homepage" : "https://forum.kerbalspaceprogram.com/index.php?/topic/188033-173-realplume-stock-v140-06sep19/"
+        "homepage" : "https://forum.kerbalspaceprogram.com/index.php?/topic/188033-173-realplume-stock-v140-06sep19/"
     },
     "install" : [
         {