Adjusted how velocities were set