New commit.

I will squash it with the previous one after code review is completed.