replaced re.search by re.findall