Working on PSF class