checkP2P updated to work in one2many scenario