Changes per Steven Lambert's comments.