 +			if(!this.isInWater()
 +				|| WurstClient.INSTANCE.mods.flightMod.isActive()
 +				|| WurstClient.INSTANCE.mods.freecamMod.isActive()
-+				|| WurstClient.INSTANCE.mods.noSlowdownMod.isActive()
++				|| WurstClient.INSTANCE.mods.noSlowdownMod.blockWaterSlowness()
 +				|| this instanceof EntityPlayer
-+				&& ((EntityPlayer)this).capabilities.isFlying)
++					&& ((EntityPlayer)this).capabilities.isFlying)
  			{
 +				
                  if (!this.isInLava() || this instanceof EntityPlayer && ((EntityPlayer)this).capabilities.isFlying)

     public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn)
     {
+		// TODO: Client
+		if(WurstClient.INSTANCE.mods.noSlowdownMod.isActive())
+			return;
+		
         entityIn.motionX *= 0.4D;

             public String call()
             {
diff --git a/net/minecraft/client/entity/EntityPlayerSP.java b/net/minecraft/client/entity/EntityPlayerSP.java
index 38f8c49..f43b455 100644
--- a/net/minecraft/client/entity/EntityPlayerSP.java
+++ b/net/minecraft/client/entity/EntityPlayerSP.java
@@ -1,7 +1,9 @@
