Making changes from Adam's comments.