Major changes to scraper