Add back in Giovanna's changes.

I accidentally deleted these, but they should be back now.