update topology to make it more robust