Updated search tool 2