Optimized network usage due to some hints from Alex.