Improved download system
Conflict solved