Improvements on the previous commit.