Improved downloading mechanics