some improvements
changed proxy creation