g2: bring in more variants