Updated version for scrapdo