Polished the new topology a bit