Elie's Version with upload