Refactored PSF form
Refactored PSF form