Another step towards Go version