add uploads to public
Merge previous changes from public repo
Merge changes