clean up, limit the velocity in the Y axis so there is a more homogenous movement
Manual merge conflicts