Add Peter's modifs