before big change to downloader