Switched to rectangles for nodes and networks