More refinement of reconnect