refactored scraper.[y