Optimized upload controller pt.1