More work on getting groups to play nice together