Adding some changes, with another change made in 2 at same time, but not yet committed.