Some refactores and network indicator