Re-written 'search'