Approved Changes for PSR

Approved PSR Changes