More moved to g2-common