More uniformity in the whole double mess.