More changes to reconnection process, squash and rename commits for better history!