More PSR1/2 again