more work on uploads