Changes to topology.c