expand to incorporate possibility of proxies