Modified the proxy logic a little