The Thomson scattering (TS) diagnostic on the Prototype-Material Plasma Exposure eXperiment has been upgraded to measure electron temperature (T e ) and density (n e ) simultaneously at two axial locations. After the first pass through the vacuum vessel, the exiting laser beamline is re-collimated in the atmosphere and rerouted into the vacuum vessel for the second pass. The upgrade will help diagnose axial T e and n e gradients between the "central chamber" and the target region which are located 1 m and 2.5 m, respectively, downstream from the Helicon radio-frequency source. The TS measurements have given T e ≈ 4-15 eV and n e ≈ 2-4 × 1019 m-3 at the central chamber and T e ≈ 1-2 eV and n e ≈ 1-2 × 1019 m-3 at the target region. The upgrade also increases the number of sampling points at the target region from 3 fibers to 5 fibers, measuring 3 cm radially across the plasma column, and 25 fibers in the central chamber, radially spanning 8 cm. The intensified CCD camera is double triggered for each laser pulse in order to measure (1) the TS and laser stray light and (2) the plasma background light that contains nuisance emission lines and bremsstrahlung. Subtracting the background light from the TS photons improves the temperature and density measurements. Details of the diagnostic setup, axial and radial measurements, and areas for further optimization are discussed.