Finished what started in last commit.