changing to PSR4