Modfied for search