Fixed laser start up and added 2D and 3D