tweaking model and scraper