Slight modifications to scraper