Phoebe and Will's first changes

I incorporated both of our changes. Let's merge this!