More changes pointed out by the reviewer.