Reworking flow of photo upload process.