Change upload process from two to one step.