adding proxy support part 1