switch to psf-internal