Updated to accomodate the deprecated downloads...