Replaced findall with search