proxy setup stuff added