Uncommitted changes from last week.