More streamlined upload (still causing problems)