added proxy code