more refactoring,
changing scraper