Revert "back to 3 groups"

This reverts commit 7d8a015c7770eae1e9b65a78dfb4c2936e3a7633.