Merge to original topotools