added ability to group messages