Edit downloader again (still in testing)