Forgot the add some of the changes for the last commit.