further tweaking for go