Revert "back to 2 groups"

This reverts commit 870280d6bda8490f67e363ad487315205e75da7c.