Updated Main and Proxies