updated for proxy