Adding river3 edits.