Upload v3 and v2.1