Cleaned up extended_scrape passing