Additional changes to prior commit.