diff --git a/FS17_GearboxAddon.zip b/FS17_GearboxAddon.zip
index 7be8dc3..0c79198 100644
Binary files a/FS17_GearboxAddon.zip and b/FS17_GearboxAddon.zip differ
diff --git a/FS17_GearboxAddon/gearboxMogli.lua b/FS17_GearboxAddon/gearboxMogli.lua
index 43e7612..59281f2 100755
--- a/FS17_GearboxAddon/gearboxMogli.lua
+++ b/FS17_GearboxAddon/gearboxMogli.lua
@@ -3899,11 +3899,7 @@ function gearboxMogli:update(dt)
 		
 		local clutchSpeed = 1 / math.max( self.mrGbMS.ClutchShiftTime, 1 )
 		
-		if     self.mrGbMS.Hydrostatic and self.mrGbMS.HydrostaticLaunch then
-			if self.mrGbMS.ManualClutch < 1 then
-				self:mrGbMSetManualClutch( 1 )
-			end
-		elseif gearboxMogli.mbIsInputPressed( "gearboxMogliCLUTCH_3" ) then
+		if     gearboxMogli.mbIsInputPressed( "gearboxMogliCLUTCH_3" ) then
 			self.mrGbML.oneButtonClutchTimer = g_currentMission.time + 100
 			self:mrGbMSetState( "AutoCloseTimer", self.mrGbML.oneButtonClutchTimer )
 			
@@ -3912,7 +3908,6 @@ function gearboxMogli:update(dt)
 			else 
 				self:mrGbMSetManualClutch( math.max( 0, self.mrGbMS.ManualClutch - dt / math.max( self.mrGbMS.ClutchShiftTime * ( self.mrGbMS.ClutchSpeedOneButton - 1 ) * 0.1, 1 ) ))
 			end
-		--self:mrGbMSetState( "AutoCloseTimer", self.mrGbML.oneButtonClutchTimer + self.mrGbMS.ManualClutch *  self.mrGbMS.ClutchTimeManual )
 		elseif InputBinding.gearboxMogliCLUTCH ~= nil then
 			local targetClutchPercent = InputBinding.getDigitalInputAxis(InputBinding.gearboxMogliCLUTCH)
 			if InputBinding.isAxisZero(targetClutchPercent) then
diff --git a/FS17_GearboxAddon/gearboxMogliMotor.lua b/FS17_GearboxAddon/gearboxMogliMotor.lua
index b62d0e7..a20110d 100644
--- a/FS17_GearboxAddon/gearboxMogliMotor.lua
+++ b/FS17_GearboxAddon/gearboxMogliMotor.lua
@@ -2185,7 +2185,9 @@ function gearboxMogliMotor:mrGbMUpdateGear( accelerationPedalRaw, doHandbrake )
 			targetRequiredRpm = math.max( targetRequiredRpm, result * self.original.ptoMotorRpmRatio )
 		end
 	end	
-	if self.vehicle.mrGbMS.ToolIsDirty and lastNoTransmission then
+	if      self.vehicle.mrGbMS.ToolIsDirty 
+			and lastNoTransmission
+			and not ( g_modIsLoaded["FS17_RpmDependentControls"] ) then
 		targetRequiredRpm = math.max( targetRequiredRpm, self.vehicle.mrGbMS.HydraulicRpm )
 	end
 	
@@ -4577,8 +4579,6 @@ function gearboxMogliMotor:mrGbMUpdateGear( accelerationPedalRaw, doHandbrake )
 	
 	if     self.noTransmission then
 		self.clutchPercent = 0
-	elseif self.vehicle.mrGbMS.Hydrostatic and self.vehicle.mrGbMS.HydrostaticLaunch then
-		self.clutchPercent = 1
 	else
 		if     self.vehicle:mrGbMGetAutoClutch()
 				or self.vehicle.mrGbMS.TorqueConverterOrHydro then
diff --git a/FS17_GearboxAddon/modDesc.xml b/FS17_GearboxAddon/modDesc.xml
index 5ce6830..b45071c 100644
--- a/FS17_GearboxAddon/modDesc.xml
+++ b/FS17_GearboxAddon/modDesc.xml
@@ -2,19 +2,19 @@
 <modDesc descVersion="38">
 	<author>Mogli aka Biedens</author>
 	<iconFilename>dds/store.dds</iconFilename>
-	<version>3.1.0.4</version>
+	<version>3.1.0.5</version>
 	<multiplayer supported="true"/>
 	
 	<l10n filenamePrefix="modDesc_l10n">
 		<text name="gearboxMogliVERSION">
-			 <de>Getriebe v3.2 build 4 von Mogli</de>
-			  <en>Gearbox v3.2 build 4 by mogli</en>
-				 <it>Cambio v3.2 build 4 by mogli</it>
-	 <fr>Transmission v3.2 build 4 by mogli</fr>
-				 <cz>Řazení v3.2 build 4 by mogli</cz>
-<pl>Skrzynia biegów v3.2 build 4 by mogli</pl>
-				<ru>Gearbox v3.2 build 4 by mogli</ru>
-				<ro>Gearbox v3.2 build 4 by mogli</ro>
+			 <de>Getriebe v3.2 build 5 von Mogli</de>
+			  <en>Gearbox v3.2 build 5 by mogli</en>
+				 <it>Cambio v3.2 build 5 by mogli</it>
+	 <fr>Transmission v3.2 build 5 by mogli</fr>
+				 <cz>Řazení v3.2 build 5 by mogli</cz>
+<pl>Skrzynia biegów v3.2 build 5 by mogli</pl>
+				<ru>Gearbox v3.2 build 5 by mogli</ru>
+				<ro>Gearbox v3.2 build 5 by mogli</ro>
 		</text>                  
 	</l10n>
 
diff --git a/src/gearboxMogli.lua b/src/gearboxMogli.lua
index 43e7612..59281f2 100755
--- a/src/gearboxMogli.lua
+++ b/src/gearboxMogli.lua
@@ -3899,11 +3899,7 @@ function gearboxMogli:update(dt)
 		
 		local clutchSpeed = 1 / math.max( self.mrGbMS.ClutchShiftTime, 1 )
 		
-		if     self.mrGbMS.Hydrostatic and self.mrGbMS.HydrostaticLaunch then
-			if self.mrGbMS.ManualClutch < 1 then
-				self:mrGbMSetManualClutch( 1 )
-			end
-		elseif gearboxMogli.mbIsInputPressed( "gearboxMogliCLUTCH_3" ) then
+		if     gearboxMogli.mbIsInputPressed( "gearboxMogliCLUTCH_3" ) then
 			self.mrGbML.oneButtonClutchTimer = g_currentMission.time + 100
 			self:mrGbMSetState( "AutoCloseTimer", self.mrGbML.oneButtonClutchTimer )
 			
@@ -3912,7 +3908,6 @@ function gearboxMogli:update(dt)
 			else 
 				self:mrGbMSetManualClutch( math.max( 0, self.mrGbMS.ManualClutch - dt / math.max( self.mrGbMS.ClutchShiftTime * ( self.mrGbMS.ClutchSpeedOneButton - 1 ) * 0.1, 1 ) ))
 			end
-		--self:mrGbMSetState( "AutoCloseTimer", self.mrGbML.oneButtonClutchTimer + self.mrGbMS.ManualClutch *  self.mrGbMS.ClutchTimeManual )
 		elseif InputBinding.gearboxMogliCLUTCH ~= nil then
 			local targetClutchPercent = InputBinding.getDigitalInputAxis(InputBinding.gearboxMogliCLUTCH)
 			if InputBinding.isAxisZero(targetClutchPercent) then
diff --git a/src/gearboxMogliMotor.lua b/src/gearboxMogliMotor.lua
index b62d0e7..a20110d 100644
--- a/src/gearboxMogliMotor.lua
+++ b/src/gearboxMogliMotor.lua
@@ -2185,7 +2185,9 @@ function gearboxMogliMotor:mrGbMUpdateGear( accelerationPedalRaw, doHandbrake )
 			targetRequiredRpm = math.max( targetRequiredRpm, result * self.original.ptoMotorRpmRatio )
 		end
 	end	
-	if self.vehicle.mrGbMS.ToolIsDirty and lastNoTransmission then
+	if      self.vehicle.mrGbMS.ToolIsDirty 
+			and lastNoTransmission
+			and not ( g_modIsLoaded["FS17_RpmDependentControls"] ) then
 		targetRequiredRpm = math.max( targetRequiredRpm, self.vehicle.mrGbMS.HydraulicRpm )
 	end
 	
@@ -4577,8 +4579,6 @@ function gearboxMogliMotor:mrGbMUpdateGear( accelerationPedalRaw, doHandbrake )
 	
 	if     self.noTransmission then
 		self.clutchPercent = 0
-	elseif self.vehicle.mrGbMS.Hydrostatic and self.vehicle.mrGbMS.HydrostaticLaunch then
-		self.clutchPercent = 1
 	else
 		if     self.vehicle:mrGbMGetAutoClutch()
 				or self.vehicle.mrGbMS.TorqueConverterOrHydro then