[wip]fixed topology management