Refactored particpant info fix