Updated with Erin's input