updated model and scraper