PSR2 modification