updated for golang