further connection management work