Added one more question group, reversed silly design decision