Updated for PATO and NPO which are now also slimmed