More work on direct uploads