Changes from latest testing.