Modification to Topology class: 2013/10/02