Changes to Laser Tool and Simulation