Changes from Tess's comments