Refactored again to reduce scraping chunks