Re-enable scraper, make multithread