saf: add scraper bits