Updated automatic connect