Convert to using new topotools