More work on scraper