g2 module now included in xf trunk.