bunch of proxy changes