Added more variable subgroups.