Modified to be consistent with graph only based representation of Networ...

Tests passing