Incorporating J. Peach's comments