substantial change to new group logic to prevent number of groups in play diminishing