tidying up the proxy a bit