Better Reconnect.
The rest of the previous commit... (oops!)