updated connection management