diff --git a/voxygen/src/anim/character/attack.rs b/voxygen/src/anim/character/attack.rs
index dd853fda44..b866629bbf 100644
--- a/voxygen/src/anim/character/attack.rs
+++ b/voxygen/src/anim/character/attack.rs
@@ -23,6 +23,8 @@ impl Animation for AttackAnimation {
         let mut next = (*skeleton).clone();
 
         let lab = 1.0;
+        let test = (anim_time as f32 * 16.0 * lab as f32).cos();
+
         let accel_med = 1.0 - (anim_time as f32 * 16.0 * lab as f32).cos();
         let accel_slow = 1.0 - (anim_time as f32 * 12.0 * lab as f32).cos();
         let accel_fast = 1.0 - (anim_time as f32 * 24.0 * lab as f32).cos();
@@ -32,6 +34,10 @@ impl Animation for AttackAnimation {
             / (1.1 + 3.9 * ((anim_time as f32 * lab as f32 * 12.4).sin()).powf(2.0 as f32)))
         .sqrt())
             * ((anim_time as f32 * lab as f32 * 12.4).sin());
+        let slower = (((5.0)
+            / (0.1 + 4.9 * ((anim_time as f32 * lab as f32 * 4.0).sin()).powf(2.0 as f32)))
+        .sqrt())
+            * ((anim_time as f32 * lab as f32 * 4.0).sin());
 
         next.head.offset = Vec3::new(
             0.0 + skeleton_attr.neck_right,
@@ -61,7 +67,6 @@ impl Animation for AttackAnimation {
             * Quaternion::rotation_y(decel * 0.08);
         next.shorts.scale = Vec3::one();
 
-
         match active_tool_kind {
             //TODO: Inventory
             Some(ToolKind::Sword(_)) => {
@@ -109,29 +114,23 @@ impl Animation for AttackAnimation {
                 next.main.scale = Vec3::one();
             },
             Some(ToolKind::Hammer(_)) => {
-                next.l_hand.offset =
-                    Vec3::new(-8.0 + accel_slow * 10.0, 8.0 + accel_fast * 3.0, 0.0);
-                next.l_hand.ori = Quaternion::rotation_z(-0.8)
-                    * Quaternion::rotation_x(0.0 + accel_med * -0.8)
-                    * Quaternion::rotation_y(0.0 + accel_med * -0.4);
-                next.l_hand.scale = Vec3::one() * 1.01;
-
-                next.r_hand.offset =
-                    Vec3::new(-8.0 + accel_slow * 10.0, 8.0 + accel_fast * 3.0, -2.0);
-                next.r_hand.ori = Quaternion::rotation_z(-0.8)
-                    * Quaternion::rotation_x(0.0 + accel_med * -0.8)
-                    * Quaternion::rotation_y(0.0 + accel_med * -0.4);
-                next.r_hand.scale = Vec3::one() * 1.01;
-
-                next.main.offset = Vec3::new(
-                    -8.0 + accel_slow * 10.0 + skeleton_attr.weapon_x,
-                    8.0 + accel_fast * 3.0,
-                    0.0,
-                );
-                next.main.ori = Quaternion::rotation_z(-0.8)
-                    * Quaternion::rotation_x(0.0 + accel_med * -0.8)
-                    * Quaternion::rotation_y(0.0 + accel_med * -0.4);
+                next.l_hand.offset = Vec3::new(0.0, 1.0, 5.0);
+                next.l_hand.ori = Quaternion::rotation_x(1.27);
+                next.l_hand.scale = Vec3::one() * 1.04;
+                next.r_hand.offset = Vec3::new(0.0, 0.0, -3.0);
+                next.r_hand.ori = Quaternion::rotation_x(1.27);
+                next.r_hand.scale = Vec3::one() * 1.05;
+                next.main.offset = Vec3::new(0.0, 6.0, -1.0);
+                next.main.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(0.0);
                 next.main.scale = Vec3::one();
+
+                next.control.offset = Vec3::new(-6.0, 3.0, 5.0 + slower * 5.0);
+                next.control.ori = Quaternion::rotation_x(-0.2 + slower * 2.0)
+                    * Quaternion::rotation_y(0.0)
+                    * Quaternion::rotation_z(1.4 + 1.57);
+                next.control.scale = Vec3::one();
             },
             Some(ToolKind::Staff(_)) => {
                 next.l_hand.offset =
diff --git a/voxygen/src/anim/character/mod.rs b/voxygen/src/anim/character/mod.rs
index c4560db4cb..0fe9e9ac1a 100644
--- a/voxygen/src/anim/character/mod.rs
+++ b/voxygen/src/anim/character/mod.rs
@@ -120,7 +120,6 @@ pub struct SkeletonAttr {
     neck_right: f32,
     weapon_x: f32,
     weapon_y: f32,
-
 }
 impl SkeletonAttr {
     pub fn calculate_scale(body: &comp::humanoid::Body) -> f32 {
@@ -152,7 +151,6 @@ impl Default for SkeletonAttr {
             neck_right: 1.0,
             weapon_x: 1.0,
             weapon_y: 1.0,
-
         }
     }
 }
diff --git a/voxygen/src/anim/character/wield.rs b/voxygen/src/anim/character/wield.rs
index f52587ae84..713061f0bc 100644
--- a/voxygen/src/anim/character/wield.rs
+++ b/voxygen/src/anim/character/wield.rs
@@ -46,10 +46,14 @@ impl Animation for WieldAnimation {
             },
             Some(ToolKind::Axe(_)) => {
                 next.l_hand.offset = Vec3::new(-4.0, 3.0, 6.0);
-                next.l_hand.ori = Quaternion::rotation_x(-0.3) * Quaternion::rotation_z(3.14 - 0.3) * Quaternion::rotation_y(-0.8);
+                next.l_hand.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_z(3.14 - 0.3)
+                    * Quaternion::rotation_y(-0.8);
                 next.l_hand.scale = Vec3::one() * 1.08;
                 next.r_hand.offset = Vec3::new(-2.5, 9.0, 4.0);
-                next.r_hand.ori = Quaternion::rotation_x(-0.3) * Quaternion::rotation_z(3.14 - 0.3)* Quaternion::rotation_y(-0.8);
+                next.r_hand.ori = Quaternion::rotation_x(-0.3)
+                    * Quaternion::rotation_z(3.14 - 0.3)
+                    * Quaternion::rotation_y(-0.8);
                 next.r_hand.scale = Vec3::one() * 1.06;
                 next.main.offset = Vec3::new(-6.0, 10.0, -1.0);
                 next.main.ori = Quaternion::rotation_x(1.27)
@@ -58,9 +62,9 @@ impl Animation for WieldAnimation {
                 next.main.scale = Vec3::one();
 
                 next.control.offset = Vec3::new(0.0, 0.0, 0.0);
-                next.control.ori = Quaternion::rotation_x( wave_ultra_slow_cos * 0.1)
+                next.control.ori = Quaternion::rotation_x(wave_ultra_slow_cos * 0.1)
                     * Quaternion::rotation_y(0.0)
-                    * Quaternion::rotation_z( wave_ultra_slow * 0.1);
+                    * Quaternion::rotation_z(wave_ultra_slow * 0.1);
                 next.control.scale = Vec3::one();
             },
             Some(ToolKind::Hammer(_)) => {