Get rid of fudge factor and don't make flick rotations additive