refactored proxies