More changes from Emily