Revert "Revert "Participant changes""

This reverts commit 750a947167e71649de7ba2044616d60b35784ea7.