(PSP) Input -refactors