Removed g2.  Updated xataface