Final version of previous commit.