Changes made by Dr. Yi

As requested by Dr. Yi, I have committed her changes here.