Optimize upload process. #2