add in goo support