More changes related to previous commit that didn't get saved before last commit.