Track upload improved