Even more edits ...