diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
index f06b213c..1ea6c83c 100644
--- a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
+++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
@@ -149,7 +149,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
             return 0;
         }
 
-        return MathHelper.sin(MathHelper.sqrt(swingProgress) * PI * 2) * 0.2F;
+        return MathHelper.sin(MathHelper.sqrt(swingProgress) * PI * 2) * 0.04F;
     }
 
     protected void adjustBodyRiding() {
@@ -167,8 +167,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
      * @param ticks       Total whole and partial ticks since the entity's existance. Used in animations together with {@code swing} and {@code move}.
      */
     protected void shakeBody(float move, float swing, float bodySwing, float ticks) {
-        tail.setRotationAndAngles(rainboom, move, swing, bodySwing, ticks);
-        bodySwing /= 5;
+        tail.setRotationAndAngles(rainboom, move, swing, bodySwing * 5, ticks);
 
         upperTorso.rotateAngleY = bodySwing;
         bipedBody.rotateAngleY = bodySwing;
diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java b/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java
index 4bf4d377..4ba32a80 100644
--- a/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java
+++ b/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java
@@ -19,7 +19,6 @@ public class ModelVillagerPony extends ModelAlicorn {
     @Override
     protected void shakeBody(float move, float swing, float bodySwing, float ticks) {
         super.shakeBody(move, swing, bodySwing, ticks);
-        bodySwing /= 5;
 
         bag.rotateAngleY = bodySwing;
         apron.rotateAngleY = bodySwing;