Beef up go support