Edits through 6.4.4