network functional again after refactoring