Modified to suits PSR-2