Merged changes with Vanessa