Overworked the code for the proxies