Merging Erin's changes into my fork