Update g2 for its new home