Better connection delegation Pt.2