Laser now follows hips and robot movement
merge conflicts