rewrite with normalized-upload