updated scraper
merge