Merging in yesterday's alterations...