Further changes to previous commit.