switch "subj" and "data." update xpi