added proxy stuff