updated for godoc