Several changes since last commit.