Now all the changes in one commit.