add iproxy in multiple files, dont want merge conflicts