network refactor done