Merging Rachel's Changes