Major changes to Scraping code.