Further updates to previous commit.