It is now 100 per cent PSR2 aware