More changes from Vanessa