Modified map to work with new velocities