JPP Edits v.2