updated for proxy environment