V-2: Improved version of the search