Following integration of Peter B's review changes.