added proxy feature (not tested yet)