Updated scrape code