Complete download feature
Improve download