Revert "Revert "GroupE""

This reverts commit 90355c2f10fa2eee76bd567e602db3a2610f5112.