Modified the scraper