Reworking Velocities to use speed