Added code changes inadvertently left out of previous commit.