Added laser
fix conflicts