Improved BumpFinder