Improved reconnecting