New re/connect logic