Fixed Jeremy's comments