Split up, add retry to negotation