Modified Code for scraping