Connection update (17/18)

Connection update