finishing up on-demand connection handling