Adding required p2-inf changes