Additional changes after testing.