Refactor to be a loopback connector