further updated scraper code