More improvements (better structure and network failure tolerant)