Improve network part