p2 collision draft

Change-Id: I3f2a2f004def13a6be36c14abdbf49928a01d02e