Unify g2

Does not work yet