Progress on upload retry
More progress on upload retry