modified:   proxy.go: reorganization