back to working on the Go version