adding Peter's edits