Update PAC

Do merge this. Not tested yet.