updated scraping code