Integration of David Black's May 25 edits