Modify, fix scrapper