Some work on re-connect feature, but issues still exist