Group updates to match real protocol and get better checking