don't update all participant, improve error handling