updated connector logic