changed to psr-1 pattern