change some download logic
start using a single variable