modified for search