DRAFT: Refine mid-connection logic