Sample app + improving upload process