Added reconnect, still one bug