Refactored previous commit.