Upated Proxy

New Proxy system