Improved on previous commit.