changed group structure