Moved over the scraper loop