Added the changes discussed in the last commit.