Drastically improved scraping