update w/better go support