update to PSR1-2