Update# let code to fit PSR-2