More work on topo generation