Some more changes to pxardaq