Emily's changes

They're awesome. you want them.