Modified for more cooperation on the proxy