incorporated edits and changes after internal EFF review