Changed connection delay to something non-blocking