Lots of scraper changes