Fix new separated p2 integration so it's runable