Updates as per merideth's request