Better join retry

Note, this is against improve_zen branch