JP's edits (1 done, 2/3 in progress)