Adding in missed changes of last commit.