more splitting, fixing upload