Changed how I handled connecting