Extended the stupid scraper