removed hard-coded groups; simplified representation