Second revision of the same thing.