Merged Tess's and Wendy's changes