Jon Forrest's edits