much improved cd_scraper