diff --git a/source/src/clientextras.cpp b/source/src/clientextras.cpp
index f966b63a..63a2dbe8 100644
--- a/source/src/clientextras.cpp
+++ b/source/src/clientextras.cpp
@@ -32,10 +32,10 @@ void renderclient(playerent *d, char *mdlname, char *vwepname)
     }
     else if(d->state==CS_EDITING)                   { anim = ANIM_JUMP|ANIM_END; }
     else if(d->state==CS_LAGGED)                    { anim = ANIM_SALUTE|ANIM_LOOP; }
-    else if(lastmillis-d->lastpain<300)             { anim = ANIM_PAIN; varseed += d->lastpain; basetime = d->lastpain; }
+    else if(lastmillis-d->lastpain<300)             { anim = ANIM_PAIN; speed = 300.0f/4; varseed += d->lastpain; basetime = d->lastpain; }
     else if(!d->onfloor && d->timeinair>0)          { anim = ANIM_JUMP|ANIM_END; }
-    else if(d->gunselect==d->lastattackgun && lastmillis-d->lastaction<attackdelay(d->gunselect))
-                                                    { anim = ANIM_ATTACK; basetime = d->lastaction; }
+    else if(d->gunselect==d->lastattackgun && lastmillis-d->lastaction<300)
+                                                    { anim = ANIM_ATTACK; speed = 300.0f/8; basetime = d->lastaction; }
     else if(!d->move && !d->strafe)                 { anim = ANIM_IDLE|ANIM_LOOP; }
     else                                            { anim = ANIM_RUN|ANIM_LOOP; speed = 1860/d->maxspeed; };
     rendermodel(mdlname, anim, 0, 1.5f, d->o.x, mz, d->o.y, d->yaw+90, d->pitch/4, speed, basetime, d, vwepname);
diff --git a/source/src/md2.h b/source/src/md2.h
index e427dad1..e398c4bb 100644
--- a/source/src/md2.h
+++ b/source/src/md2.h
@@ -153,7 +153,7 @@ struct md2 : vertmodel
             //                      0   1   2   3   4   5   6   7   8   9  10  11  12   13  14  15  16  17 18  19  20   21  21  23  24     
             //                      I   R   A   P   P   P   J   L   F   S   T   W   P   CI  CW  CA  CP  CD  D   D   D   LD  LD  LD   F
             static int frame[] =  { 0,  40, 46, 54, 58, 62, 66, 69, 72, 84, 95, 112,123,135,154,160,169,173,178,184,190,183,189,197, 0 };
-            static int range[] =  { 40, 5,  8,  4,  4,  4,  3,  3,  12, 11, 17, 11, 12, 19, 6,  9,  4,  5,  6,  6,  8,  1,  1,  1,   7 };
+            static int range[] =  { 40, 6,  8,  4,  4,  4,  3,  3,  12, 11, 17, 11, 12, 19, 6,  9,  4,  5,  6,  6,  8,  1,  1,  1,   7 };
             static int animfr[] = { 0, 1, 2, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 21, 24 };
 
             as.speed = speed;