rework auto-connect feature