improved scraper