Updated with Peter's comments