Refactoring
Pre deletion of needsProxy
Without needsProxy