Final edit to download wrapper