removing PSR0, using PSR1 instead