Additional changes to PJ