after refactoring networking