update to PSR-2