Rewrote bump detection and matching