fixed from texts, (uploader still not work)