connection management rework