moving to (half) psr4