Upload with new logic