Fixed laser
Merge remote-tracking branch 'origin/Ryan's-branch'