Some revisions to reflect discussion ...