working on Vanessa's changes