Editing: client.go