new version with all search