Return is now at back of the function again. Also added a check to not shuffle if only one connection in available.