1st adjustments to downloader