Tweaking reconnection/polling logic