update with Vanessa's changes