updated scraper to have all the scraping done in-line