Final commit, I hope.
Full final commit.