Proxies+

proxies plus some resource changes.