Yanic#252 Updated to comply with event grouping changes