Some changes to initial upload