adding preliminary PSP support