added proxy conditionals