Added buggy uploader