Expanding download logic