Finally got uploads working correctly, please verify