old changes merge
Participants multiple bugs resolved. @TODO, duplication record should be removed