addressed Peter's comments