Updates to psf_2D