More master-side relay logic