Merging changes from Rachel Slaybaugh

Needed to do this on the command line because of conflict.