Address the rest of Peter's comments