EDIT2

More editing.