diff --git a/src/Dodge/Creature/Action/Movement.hs b/src/Dodge/Creature/Action/Movement.hs
index 373c0a26d..35d627b13 100644
--- a/src/Dodge/Creature/Action/Movement.hs
+++ b/src/Dodge/Creature/Action/Movement.hs
@@ -18,7 +18,10 @@ crMvBy
 crMvBy p' cr = advanceStepCounter (magV p) $ over crPos (+.+ p) cr
   where 
     p =  (*.*) (equipFactor * aimingFactor) $ rotateV (_crDir cr) p'
-    equipFactor = product $ map equipSpeed $ IM.elems $ _crInv cr
+    equipFactor 
+        | _posture (_crStance cr) == Aiming 
+                    = product $ map equipAimSpeed $ IM.elems $ _crInv cr
+        | otherwise = product $ map equipSpeed $ IM.elems $ _crInv cr
     aimingFactor 
         | _posture (_crStance cr) == Aiming = fromMaybe 1 $ it ^? itAimingSpeed
         | otherwise = 1
@@ -68,6 +71,6 @@ equipSpeed _ = 1
 equipAimSpeed :: Item -> Float
 equipAimSpeed NoItem = 1
 equipAimSpeed it 
-    | _itIdentity it == FrontArmour = 0.75
-    | _itIdentity it == FlameShield = 0.75
+    | _itIdentity it == FrontArmour = 0.5
+    | _itIdentity it == FlameShield = 0.5
     | otherwise                     = 1
diff --git a/src/Dodge/Creature/YourControl.hs b/src/Dodge/Creature/YourControl.hs
index b55c9f2de..4c1f6148c 100644
--- a/src/Dodge/Creature/YourControl.hs
+++ b/src/Dodge/Creature/YourControl.hs
@@ -24,8 +24,7 @@ yourControl w (f,g) cr =
     , Just . mouseActionsCr (_mouseButtons w) $ wasdWithAiming w speed 0 cr
     )
   where 
-    speed = 3 * equipFactor
-    equipFactor = product $ map equipSpeed $ IM.elems $ _crInv $ _creatures w IM.! 0
+    speed = 3
 {- | Turn key presses into creature movement.  -}
 wasdWithAiming 
     :: World