Further edits, extension to previous commit.