edits; sync with 11 and 12