Upload and other changes