minor network modifiers edit
fixing merge conflict