Oregon Update.
Compl. previous commit.