revamped, scrapers working