uploader amendments #234