Update marshal.go