Improve the reconnection mechanism