added g2 stuff